Fixes and updates to Telemetry calculation