Fix a few compilation errors, not all