Further migration corrections