fixes in stage API