Fix problems found during review.