clean up minor tracing fixes