Some tweaks to catch things missed in the pull request.