Fixed a few things I messed up in the last commit.