Fixed some things I broke with the last commit.