Fix the definition of some of the tracking functions