Tracker tweaks