Fix some customer feedback.