fix a couple regressions