Fix a few more things.