Fix the review comments.