diff --git a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
index 2ba04e8b3..32e09e924 100644
--- a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
@@ -356,14 +356,14 @@ void ConfigOutputWidget::refreshWidgetsValues(UAVObject *obj)
         // Setup labels and combos for banks according to board type
         if (board == 0x0903) {
             // Revolution family of boards 6 timer banks
-            bankLabels << "1 (1-2)" << "2 (3)" << "3 (4)" << "4 (5-6)" << "5 (7-8)" << "6 (9-10)";
-            channelBanks << 1 << 1 << 2 << 3 << 4 << 4 << 5 << 5 << 6 << 6;
+            bankLabels << "1 (1-2)" << "2 (3)" << "3 (4)" << "4 (5-6)" << "5 (7,12)" << "6 (8-11)";
+            channelBanks << 1 << 1 << 2 << 3 << 4 << 4 << 5 << 6 << 6 << 6 << 6 << 5;
         } else if (board == 0x0905) {
             // Revolution Nano
             bankLabels << "1 (1)" << "2 (2,7,11)" << "3 (3)" << "4 (4)" << "5 (5-6)" << "6 (8-10,12)";
             channelBanks << 1 << 2 << 3 << 4 << 5 << 5 << 2 << 6 << 6 << 6 << 2 << 6;
         }
-    }
+    }    
 
     int i = 0;
     foreach(QString banklabel, bankLabels) {
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp
index 4b886f7ca..19db80137 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp
@@ -49,6 +49,7 @@ void AutoUpdatePage::autoUpdate()
     Q_ASSERT(uploader);
     m_isUpdating = true;
     uploader->autoUpdate(ui->eraseSettings->isChecked());
+    getWizard()->setRestartNeeded(true);
 }
 
 void AutoUpdatePage::updateStatus(uploader::ProgressStep status, QVariant value)
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp
index f6010f72d..245ed42f0 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp
@@ -77,25 +77,7 @@ bool EscPage::isSynchOrOneShotAvailable()
 
     switch (getWizard()->getControllerType()) {
     case SetupWizard::CONTROLLER_NANO:
-        switch (getWizard()->getVehicleType()) {
-        case SetupWizard::VEHICLE_MULTI:
-            switch (getWizard()->getVehicleSubType()) {
-            case SetupWizard::MULTI_ROTOR_TRI_Y:
-            case SetupWizard::MULTI_ROTOR_QUAD_X:
-            case SetupWizard::MULTI_ROTOR_QUAD_H:
-            case SetupWizard::MULTI_ROTOR_QUAD_PLUS:
-                available = getWizard()->getInputType() != SetupWizard::INPUT_PWM;
-                break;
-
-            default:
-                available = false;
-                break;
-            }
-            break;
-
-        default:
-            break;
-        }
+        available = getWizard()->getInputType() != SetupWizard::INPUT_PWM;
         break;
 
     default:
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
index 517c65f3e..4707cc47f 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
@@ -100,7 +100,9 @@ int SetupWizard::nextId() const
             return PAGE_INPUT;
 
         case CONTROLLER_NANO:
-            reboot();
+            if (isRestartNeeded()) {
+                reboot();
+            }
             return PAGE_INPUT;
 
         case CONTROLLER_OPLINK: