Make changes based on CR comments.