Attempt to fix data migration failures