Fixed issues from the code review.