QA improvements.