Fixed compilation problems following 2.4.0 refactoring.