Cleaning up some issues with the previous commits in this pull request