Improve traces + small fix.

2 files changed