Fix a few remaining things.