Migration issuses sorted