diff --git a/ground/openpilotgcs/src/plugins/rawhid/rawhid.cpp b/ground/openpilotgcs/src/plugins/rawhid/rawhid.cpp
index 4649d6162..eadf55a0c 100644
--- a/ground/openpilotgcs/src/plugins/rawhid/rawhid.cpp
+++ b/ground/openpilotgcs/src/plugins/rawhid/rawhid.cpp
@@ -144,7 +144,7 @@ RawHIDReadThread::~RawHIDReadThread()
 {
     m_running = false;
     //wait for the thread to terminate
-    if(wait(1000) == false)
+    if(wait(10000) == false)
         qDebug() << "Cannot terminate RawHIDReadThread";
 }
 
@@ -216,7 +216,7 @@ RawHIDWriteThread::~RawHIDWriteThread()
 {
     m_running = false;
     //wait for the thread to terminate
-    if(wait(1000) == false)
+    if(wait(10000) == false)
         qDebug() << "Cannot terminate RawHIDReadThread";
 }
 
diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
index bd8f960a7..841cb2304 100755
--- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
@@ -456,7 +456,7 @@ void UploaderGadgetWidget::systemRescue()
         delete dfu;
         dfu = NULL;
     }
-    // Avoid dumb users pressing Rescue twice. It can happen.
+    // Avoid users pressing Rescue twice.
     m_config->rescueButton->setEnabled(false);
 
     // Now we're good to go: