diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp
index c235788df..99f0bb90f 100644
--- a/companion/src/apppreferencesdialog.cpp
+++ b/companion/src/apppreferencesdialog.cpp
@@ -164,6 +164,11 @@ void AppPreferencesDialog::initSettings()
 {
   const Profile & profile = g.currentProfile();
 
+  // Disable these for now, until online elements are implemented
+  ui->autoCheckFirmware->setDisabled(true);
+  ui->autoCheckCompanion->setDisabled(true);
+  ui->OpenTxBranch->setDisabled(true);
+
   ui->snapshotClipboardCKB->setChecked(g.snapToClpbrd());
   ui->burnFirmware->setChecked(profile.burnFirmware());
   ui->snapshotPath->setText(g.snapshotDir());
diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui
index 80301223d..a3156efa3 100644
--- a/companion/src/apppreferencesdialog.ui
+++ b/companion/src/apppreferencesdialog.ui
@@ -1002,7 +1002,7 @@ Mode 4:
            <item>
             <widget class="QCheckBox" name="opt_appDebugLog">
              <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Keep a log of all debugging messages generated by the desktop Companion/Simulator applications. An OpenTX developer may request this to help diagnose an issue.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Keep a log of all debugging messages generated by the desktop Companion/Simulator applications. An EdgeTX developer may request this to help diagnose an issue.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="text">
               <string>Application (Companion/Simulator)</string>
@@ -1147,7 +1147,7 @@ Mode 4:
            <item>
             <widget class="QCheckBox" name="autoCheckFirmware">
              <property name="text">
-              <string>Automatic check for OpenTX firmware updates</string>
+              <string>Automatic check for firmware updates</string>
              </property>
              <property name="checked">
               <bool>true</bool>
diff --git a/companion/src/simulation/simulatorstartupdialog.ui b/companion/src/simulation/simulatorstartupdialog.ui
index ba97d2c75..0ec41e6b1 100644
--- a/companion/src/simulation/simulatorstartupdialog.ui
+++ b/companion/src/simulation/simulatorstartupdialog.ui
@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>OpenTX Simulator - Startup Options</string>
+   <string>EdgeTX Simulator - Startup Options</string>
   </property>
   <property name="modal">
    <bool>true</bool>