a bit of tracking fixes