QC6 Tweaks P1

Some minor tweaks