Changes from code review.