Fixed compilation errors due to changes in 3.0-RC3