Finish fixing almost bugs in waiting room