Fixed some things I messed up in the last commit.