QA issues fixed