Make the migration more resilient