diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index fd4804dd6..3d99fd0c5 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -174,8 +174,8 @@ RawSourceRange RawSource::getRange(bool singleprec)
         case TELEMETRY_SOURCE_ASPEED_MAX:
         case TELEMETRY_SOURCE_SPEED:
         case TELEMETRY_SOURCE_SPEED_MAX:
-          result.step = singleprec ? 1 : 1;
-          result.max = singleprec ? (1*255) : 2000;
+          result.step = singleprec ? 2 : 1;
+          result.max = singleprec ? (2*255) : 2000;
           if (model && !model->frsky.imperial) {
             result.step *= 1.852;
             result.max *= 1.852;
diff --git a/companion/src/modeledit/logicalswitches.cpp b/companion/src/modeledit/logicalswitches.cpp
index efe84b594..cae87ffce 100644
--- a/companion/src/modeledit/logicalswitches.cpp
+++ b/companion/src/modeledit/logicalswitches.cpp
@@ -230,7 +230,7 @@ void LogicalSwitchesPanel::edited()
         }
         else {
           model.customSw[i].val2 = round((value-range.offset)/range.step);;
-          value= model.customSw[i].val2*range.step + range.offset;
+          value = model.customSw[i].val2*range.step + range.offset;
         }
         if (source.isTimeBased()) cswitchTOffset[i]->setTime(QTimeS(value));
         else cswitchOffset[i]->setValue(value);
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 39a513e88..fbe4011f6 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -813,6 +813,10 @@ getvalue_t convert8bitsTelemValue(uint8_t channel, ls_telemetry_value_t value)
       break;
     case TELEM_CELL:
     case TELEM_HDG:
+    case TELEM_ASPEED:
+    case TELEM_MAX_ASPEED:
+    case TELEM_SPEED:
+    case TELEM_MAX_SPEED:
       result = value * 2;
       break;
     case TELEM_DIST: