Waitlist fix. Merged from old analytics code changes.