Fixing issues for QA2