Compilation errors fix