Fix things per code review.