Made QA fixes