continuing api fixes