Fix Compilation errors