Address api fixes