Final QA changes