Fixes from the pull request review.