Tracing improvements.