Fixed compilation errors on master