tracing extension and bundling fixes