Traces clean-up and minor fixes