Fix responses according to the HW5 feedback.