diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml
index 9cf7b9b4e73945b87213ace1fa854e8746cae235..87d1556f396807acba0f03724e4d742f2662edad 100644
--- a/src/VehicleSetup/FirmwareUpgrade.qml
+++ b/src/VehicleSetup/FirmwareUpgrade.qml
@@ -117,8 +117,6 @@ QGCView {
             statusTextArea.append(flashFailText)
             flashCompleteWaitTimer.running = true
         }
-
-        onFlashComplete: flashCompleteWaitTimer.running = true
     }
 
     onCompleted: {
@@ -128,22 +126,6 @@ QGCView {
         }
     }
 
-    // After a flash completes we start this timer to trigger resetting the ui back to it's initial state of being ready to
-    // flash another board. We do this only after the timer triggers to leave the results of the previous flash on the screen
-    // for a small amount amount of time.
-
-    Timer {
-        id:         flashCompleteWaitTimer
-        interval:   15000
-
-        onTriggered: {
-            initialBoardSearch = true
-            progressBar.value = 0
-            statusTextArea.append(welcomeText)
-            controller.startBoardSearch()
-        }
-    }
-
     Component {
         id: pixhawkFirmwareSelectDialog
 
diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc
index 68e57613641f3c9d88f8e18e633d5214b7e5a3b6..aad959d575b06834b6cbf54628040c1e4d2909a5 100644
--- a/src/comm/LinkManager.cc
+++ b/src/comm/LinkManager.cc
@@ -864,6 +864,6 @@ void LinkManager::_activeLinkCheck(void)
     }
 
     if (!found) {
-        qgcApp()->showMessage("You have connected to a Vehicle which does not have an SD Card inserted. Please insert an SD card and try again.");
+        qgcApp()->showMessage("Your Vehicle is not responding. If this continues please check that you have an SD Card inserted and try again.");
     }
 }
diff --git a/src/comm/LinkManager.h b/src/comm/LinkManager.h
index b7c933232d7f6041449ad9efa98e4668cb1ff255..eda25d6223f5ddc298cbac5f1c24fb821f227942 100644
--- a/src/comm/LinkManager.h
+++ b/src/comm/LinkManager.h
@@ -244,9 +244,9 @@ private:
     bool _autoconnect3DRRadio;
     bool _autoconnectPX4Flow;
 
-    QTimer                  _activeLinkCheckTimer;                  // Timer which checks for a vehicle showing up on a usb direct link
-    QList<LinkInterface*>   _activeLinkCheckList;                   // List of links we are waiting for a vehicle to show up on
-    static const int        _activeLinkCheckTimeoutMSecs = 7000;
+    QTimer                  _activeLinkCheckTimer;                  ///< Timer which checks for a vehicle showing up on a usb direct link
+    QList<LinkInterface*>   _activeLinkCheckList;                   ///< List of links we are waiting for a vehicle to show up on
+    static const int        _activeLinkCheckTimeoutMSecs = 10000;   ///< Amount of time to wait for a heatbeat. Keep in mind ArduPilot stack heartbeat is slow to come.
 
     static const char*  _settingsGroup;
     static const char*  _autoconnectUDPKey;