Tweaks to waiting list