fix a few API regressions