More QA fixes