Fix a couple bugs in tracing
2 files changed