Tracers changes

Barely noticeable improvements to tracers.