Fix the migration based on some errors I saw with real data