Minor changes to traces.