diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index bbd3d2029..e1cdb86e5 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -3014,7 +3014,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
     internalField.Append(new UnsignedField<8>(modelData.moduleData[0].modelId));
   }
 
-  if (IS_TARANIS_X9E(board) && version >= 217)
+  if (IS_TARANIS_X9E(board))
     internalField.Append(new SwitchesWarningField<64>(modelData.switchWarningStates, board, version));
   else if (IS_TARANIS(board))
     internalField.Append(new SwitchesWarningField<16>(modelData.switchWarningStates, board, version));
@@ -3022,7 +3022,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
     internalField.Append(new SwitchesWarningField<8>(modelData.switchWarningStates, board, version));
 
 
-  if (IS_TARANIS_X9E(board) && version >= 217)
+  if (IS_TARANIS_X9E(board))
     internalField.Append(new UnsignedField<32>(modelData.switchWarningEnable));
   else if (version >= 216)
     internalField.Append(new UnsignedField<8>(modelData.switchWarningEnable));
diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp
index 8946a1949..4c671e295 100644
--- a/radio/src/eeprom_conversions.cpp
+++ b/radio/src/eeprom_conversions.cpp
@@ -917,7 +917,7 @@ void ConvertModel_216_to_217(ModelData &model)
   }
   newModel.telemetryProtocol = oldModel.telemetryProtocol;
   newModel.thrTrim = oldModel.thrTrim;
-  newModel.trimInc = oldModel.trimInc - 2;
+  newModel.trimInc = oldModel.trimInc;
   newModel.disableThrottleWarning = oldModel.disableThrottleWarning;
   newModel.displayChecklist = oldModel.displayChecklist;
   newModel.extendedLimits = oldModel.extendedLimits;
@@ -1044,6 +1044,9 @@ void ConvertModel_216_to_217(ModelData &model)
     newModel.moduleData[i].ppmPulsePol = oldModel.moduleData[i].ppmPulsePol;
   }
 
+#if defined(PCBTARANIS)
+  newModel.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_XJT;
+#endif
   newModel.moduleData[EXTERNAL_MODULE].type = oldModel.externalModule;
 
 #if defined(PCBTARANIS)
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index afeba49fd..70730aeb7 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -420,7 +420,9 @@ void modelDefault(uint8_t id)
   }
 #endif
 
-#if defined(PCBSKY9X)
+#if defined(PCBTARANIS)
+  g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_XJT;
+#elif defined(PCBSKY9X)
   g_model.moduleData[EXTERNAL_MODULE].type = MODULE_TYPE_PPM;
 #endif