Fix univariate stuff