Fixed the files I screwed up in the merging of the pull request.