Migrate working with minor issues in secondary