Various trace fixes.