More HQM Tweaks