stage API fixes