More tracking fixes