Fix a few things.