Fix some bugs in the RSVP System