stage fixes