Fixed a couple of issues with last commit.