Fix minor merge issues found on review.