more broken api fixes