Fixed some tracking issues.