Fix errors caught in review.