diff --git a/ground/openpilotgcs/src/plugins/uploader/op_dfu.cpp b/ground/openpilotgcs/src/plugins/uploader/op_dfu.cpp
index efd7aa87d..a3fe178c6 100644
--- a/ground/openpilotgcs/src/plugins/uploader/op_dfu.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/op_dfu.cpp
@@ -100,7 +100,7 @@ DFUObject::DFUObject(bool _debug,bool _use_serial,QString portname):
        if (devices.length()==1) {
            hidHandle.open(1,devices.first().vendorID,devices.first().productID,0,0);
         } else {
-           qDebug() << "More than one device, don't know what to do!";
+           qDebug() << devices.length()  << " device(s) detected, don't know what to do!";
            mready = false;
        }
 
diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
index 8163d3968..d9823a36c 100755
--- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
@@ -161,6 +161,7 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
 
     switch (currentStep) {
     case IAP_STATE_READY:
+        m_config->haltButton->setEnabled(false);
         getSerialPorts(); // Useful in case a new serial port appeared since the initial list,
                           // otherwise we won't find it when we stop the board.
         // The board is running, send the 1st IAP Reset order:
@@ -179,6 +180,7 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
             log("Reset did NOT happen");
             currentStep = IAP_STATE_READY;
             disconnect(fwIAP, SIGNAL(transactionCompleted(UAVObject*,bool)),this,SLOT(goToBootloader(UAVObject*, bool)));
+            m_config->haltButton->setEnabled(true);
             break;
         }
         delay::msleep(600);
@@ -193,6 +195,7 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
             log("Reset did NOT happen");
             currentStep = IAP_STATE_READY;
             disconnect(fwIAP, SIGNAL(transactionCompleted(UAVObject*,bool)),this,SLOT(goToBootloader(UAVObject*, bool)));
+            m_config->haltButton->setEnabled(true);
             break;
         }
         delay::msleep(600);
@@ -208,6 +211,7 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
             log("Oops, failure step 3");
             log("Reset did NOT happen");
             disconnect(fwIAP, SIGNAL(transactionCompleted(UAVObject*,bool)),this,SLOT(goToBootloader(UAVObject*, bool)));
+            m_config->haltButton->setEnabled(true);
             break;
         }
 
@@ -247,6 +251,7 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
             cm->resumePolling();
             currentStep = IAP_STATE_READY;
             m_config->boardStatus->setText("Bootloader?");
+            m_config->haltButton->setEnabled(true);
             return;
         }
         dfu->AbortOperation();
@@ -360,7 +365,6 @@ void UploaderGadgetWidget::systemBoot()
     dfu->JumpToApp();
     // Restart the polling thread
     cm->resumePolling();
-    m_config->bootButton->setEnabled(true);
     m_config->rescueButton->setEnabled(true);
     m_config->telemetryLink->setEnabled(true);
     m_config->boardStatus->setText("Running");