Minor Changes

If you accept/merge this to your repo, these changes will appear in your open pull request to the canonical repository.