some tracking fixes