Fix trace related code