Fixes for tracking code