Updates from feedback.