Minor updates from code review.