Fixed a couple of silly bugs in previous commit.