Fixed issues for QA
Updated files
Updated files