Address QA issues.