Forgot a few things from that last commit.