Minor changes to tracking code