Fix issues from the code review.