More QA cleanups