Fixes for rsvp5