Fixing QA issues