Remove compilation errors