Fix to HQA build tweak