Fixing a few mistakes from the last commit.