fix various regressions