Waitlist bug fixes