More migration dependency fixing
ready for new deploy