Tracking issues corrected