QC tidy-ups (part 2)

See commit message