Fixed issues for QA
Fixed issues for QA