Micro adjustments from HWC4

See merge request main/Sumatra!1449

sumatra-commit: 102bed2e9dc603c9e869e82c78dc0acbefbbe549
2 jobs for master in 4 minutes and 14 seconds (queued for 6 seconds)
Status Name Job ID Coverage
  Build
passed build #70546

00:03:14

passed test #70547

00:04:13