Some fixes to the tracer