diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index b74433cff..fd29cb24c 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -1590,7 +1590,7 @@ class CustomFunctionsConversionTable: public ConversionTable {
       int val=0;
 
       if (version >= 216) {
-        for (int i=0; i<32; i++) {
+        for (int i=0; i<MAX_CHANNELS(board, version); i++) {
           addConversion(i, val);
         }
         val++;
diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index 15fc54096..0308d0137 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -1683,12 +1683,11 @@ void MainWindow::createActions()
 }
 
 void MainWindow::createMenus()
-
 {
-    QMenu *recentFileMenu=new QMenu(tr("Recent Files"), this);
-    QMenu *languageMenu=new QMenu(tr("Set Menu Language"), this);
-    QMenu *themeMenu=new QMenu(tr("Set Icon Theme"), this);
-    QMenu *iconThemeSizeMenu=new QMenu(tr("Set Icon Size"), this);
+    QMenu *recentFileMenu = new QMenu(tr("Recent Files"), this);
+    QMenu *languageMenu = new QMenu(tr("Set Menu Language"), this);
+    QMenu *themeMenu = new QMenu(tr("Set Icon Theme"), this);
+    QMenu *iconThemeSizeMenu = new QMenu(tr("Set Icon Size"), this);
 
     fileMenu = menuBar()->addMenu(tr("File"));
     fileMenu->addAction(newAct);