trace fixes