EmirH: fixed small issues with rsvp