Compilation fixes
Compilation fixes