TrackerData fixes
interop test TrackerData fix