More tweaks to tracking specifics