Tracing improvements