I'm going to do another pull request later that fixes them all at once