Fix several mistakes in last commit.