fixup some trace calls