Fixed issues for QA