Fix a few compilation errors