General updates for QA fixes