Diags fixes

Fixes request tracing tracing diags requests