HR-261 QA-2 fixes