Apply small fixes found during review.