more rsvp/eligibility fixes