Fix issue with TrackUpdater refactoring