Added a few things I missed in the last commit.