Eligibility, fixes