Compilation errors cleaned