Fixes for rsvp2