Tweaks to tracking