Tracking fixes & bug fixes