7.x.stage fixes