Some trace changes