Fix possible breaks in a migration