server api fixes