Fix a few mistakes in last commit.