Fix several pieces of feedback.