Tweaks to traffic thread