fix a bunch of regressions after internals rewrite