Fixes for rsvp3