More fixes to migrating data.