Tweaks to tracking and dial timeout