Attempt some waitlist fixes