Fix a few