stage api fixes