fix data and model stage / triggers