Fixed issues from review.