Correct minor problems with previous commit.