Fixed compilation against latest trunk update