legacy api fixes