Fixed tracking issues.