fixing compilation errors 2.0