Quick bug fixes from last commit.