Extended QA fixes