Fixes for rsvp