Prepare for 2.4 for master
Fixed compilation problems following refactoring for 2.4.0.