Fixed compilation with trunk