tracing fixes