Bugfixes Around RSVP