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