Fix issues found during the review.