Tweaks to track sensors