Fixed tracking issues