Fix a few things in the last commit.