Updates from code review.