Minor changes before code review.