Misc changes and tracking code update