All of these changes exist in another pull request (#476)