More updates from code review.