Fix things according to review.