some fixes for tracing