Updates for code review.