Fix type and eligibility migration