fixes to support rescaling with custom regressors