Corrections from code review.