Fixed compilation error from rebases.