Fix per the review comments.