A few of the pull request changes