diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 3ae13a13b..e01e89bd9 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -996,7 +996,6 @@ enum Capability {
  HasStickScroll,
  HasSoundMixer,
  NumModules,
- FSSwitch,
  PPMCenter,
  SYMLimits,
  HasCurrentCalibration,
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index a0917d9b6..4cb383458 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -602,8 +602,6 @@ int Open9xInterface::getCapability(const Capability capability)
       return 1;
     case DSM2Indexes:
       return 1;
-    case FSSwitch:
-      return 1;
     case MixesWithoutExpo:
       return 1;
     case NumCurves:
diff --git a/companion/src/modeledit/expodialog.cpp b/companion/src/modeledit/expodialog.cpp
index d632777df..2dc60593b 100644
--- a/companion/src/modeledit/expodialog.cpp
+++ b/companion/src/modeledit/expodialog.cpp
@@ -62,6 +62,8 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, i
     ui->trimCB->hide();
   }
 
+  ui->trimCB->setCurrentIndex(1 - ed->carryTrim);
+
   int expolength = GetEepromInterface()->getCapability(HasExpoNames);
   if (!expolength) {
     ui->lineNameLabel->hide();
diff --git a/companion/src/modeledit/mixerdialog.cpp b/companion/src/modeledit/mixerdialog.cpp
index 6d527b6d6..5b34c7406 100644
--- a/companion/src/modeledit/mixerdialog.cpp
+++ b/companion/src/modeledit/mixerdialog.cpp
@@ -45,14 +45,19 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
     ui->trimCB->addItem(tr("Thr"), 3);
     ui->trimCB->addItem(tr("Ail"), 4);
 
-    ui->trimCB->setCurrentIndex((-md->carryTrim)+1);
-    int namelength=GetEepromInterface()->getCapability(HasMixerNames);
+    ui->trimCB->setCurrentIndex(1 - md->carryTrim);
+
+    int namelength = GetEepromInterface()->getCapability(HasMixerNames);
     if (!namelength) {
       ui->label_name->hide();
       ui->mixerName->hide();
-    } else {
+    }
+    else {
       ui->mixerName->setMaxLength(namelength);
     }
+    ui->mixerName->setValidator(new QRegExpValidator(rx, this));
+    ui->mixerName->setText(md->name);
+
     if (!GetEepromInterface()->getCapability(FlightPhases)) {
       ui->label_phases->hide();
       for (int i=0; i<9; i++) {
@@ -74,9 +79,6 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
       }
     }
 
-    ui->mixerName->setValidator(new QRegExpValidator(rx, this));
-    ui->mixerName->setText(md->name);
-
     populateSwitchCB(ui->switchesCB,md->swtch);
     ui->warningCB->setCurrentIndex(md->mixWarn);
     ui->mltpxCB->setCurrentIndex(md->mltpx);