Fixed a couple of errors in the last commit.