Fixed some things for merging my pull request