More trace fixes.