Corrections after code review.