fix some regressions