Fixes for rsvp4