Updates based on QA feedback.