Fix problems with the tracing