More parallel trace fixes.