Fixed the things I broke with last commit