Fixing trace related things