Fixed minor issues according to review.