fix a few regressions