Telemetry - minor fixes