Update with QA feedback.