More fixes for old scipy.