Compilation fixes

Fixes compilation issues