various new-api fixes