Telemetry refactoring - companion fixes