Improved tracker start/stop behaviour