QA final fixes