Tiny bug repairs from last commit.