Fixed compilation with latest changes