Get leave room working
Fix two bugs in leave_room