fix some uncaught regressions