Final post QA changes