More fixes for Minuit2 builds