Minor fixes from last commit.