Some fixes
Fix a compilation error