more api fixes