fixes to QA