fix a couple of regressions