Getting ready for post migration