diff --git a/ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowserconfiguration.h b/ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowserconfiguration.h
index 6dcae4bf5..ff6237e7c 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowserconfiguration.h
+++ b/ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowserconfiguration.h
@@ -111,8 +111,8 @@ public slots:
 private:
     QColor m_recentlyUpdatedColor;
     QColor m_manuallyChangedColor;
-    int m_recentlyUpdatedTimeout;
     bool m_onlyHilightChangedValues;
+    int m_recentlyUpdatedTimeout;
     bool m_useCategorizedView;
     bool m_useScientificView;
     bool m_showMetaData;
diff --git a/ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.h b/ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.h
index 775785c69..be7737e1d 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.h
+++ b/ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.h
@@ -110,12 +110,12 @@ private:
     TreeItem *m_rootItem;
     TopTreeItem *m_settingsTree;
     TopTreeItem *m_nonSettingsTree;
+    bool m_useScientificFloatNotation;
+    bool m_categorize;
     int m_recentlyUpdatedTimeout;
     QColor m_recentlyUpdatedColor;
     QColor m_manuallyChangedColor;
     bool m_onlyHilightChangedValues;
-    bool m_useScientificFloatNotation;
-    bool m_categorize;
 
     // Highlight manager to handle highlighting of tree items.
     HighLightManager *m_highlightManager;
diff --git a/ground/openpilotgcs/src/plugins/uploader/SSP/port.h b/ground/openpilotgcs/src/plugins/uploader/SSP/port.h
index 8f141625f..e9f3bf049 100644
--- a/ground/openpilotgcs/src/plugins/uploader/SSP/port.h
+++ b/ground/openpilotgcs/src/plugins/uploader/SSP/port.h
@@ -64,7 +64,7 @@ public:
     uint32_t TxError;
     uint16_t flags;
     port(QString name);
-    ~port();
+    virtual ~port();
     portstatus status();
 private:
     portstatus mstatus;
diff --git a/ground/openpilotgcs/src/plugins/uploader/SSP/qsspt.h b/ground/openpilotgcs/src/plugins/uploader/SSP/qsspt.h
index 2a4714bcb..0ec228ce6 100644
--- a/ground/openpilotgcs/src/plugins/uploader/SSP/qsspt.h
+++ b/ground/openpilotgcs/src/plugins/uploader/SSP/qsspt.h
@@ -47,8 +47,8 @@ private:
     QQueue<QByteArray> queue;
     QMutex mutex;
     QMutex sendbufmutex;
-    bool datapending;
     bool endthread;
+    bool datapending;
     uint16_t sendstatus;
     uint16_t receivestatus;
     QWaitCondition sendwait;
diff --git a/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp b/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
index 9afbe5bdb..4e3312c72 100644
--- a/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
@@ -225,6 +225,7 @@ void DeviceWidget::dfuStatus(QString str)
 
 void DeviceWidget::confirmCB(int value)
 {
+    Q_UNUSED(value);
     updateButtons(true);
 }
 
@@ -277,7 +278,7 @@ void DeviceWidget::loadFirmware()
 
     QByteArray desc = loadedFW.right(100);
     QPixmap px;
-    if (loadedFW.length() > m_dfu->devices[deviceID].SizeOfCode) {
+    if (loadedFW.length() > (int)m_dfu->devices[deviceID].SizeOfCode) {
         myDevice->lblCRCL->setText(tr("Can't calculate, file too big for device"));
     } else {
         myDevice->lblCRCL->setText(QString::number(DFUObject::CRCFromQBArray(loadedFW, m_dfu->devices[deviceID].SizeOfCode)));
diff --git a/ground/openpilotgcs/src/plugins/uploader/op_dfu.cpp b/ground/openpilotgcs/src/plugins/uploader/op_dfu.cpp
index c3dcd20ad..e75934c9d 100644
--- a/ground/openpilotgcs/src/plugins/uploader/op_dfu.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/op_dfu.cpp
@@ -637,8 +637,8 @@ bool DFUObject::findDevices()
             buf[7] = 0;
             buf[8] = 0;
             buf[9] = 0;
-            int result = sendData(buf, BUF_LEN);
-            result = receiveData(buf, BUF_LEN);
+            sendData(buf, BUF_LEN);
+            receiveData(buf, BUF_LEN);
             devices[x].ID = buf[14];
             devices[x].ID = devices[x].ID << 8 | (quint8)buf[15];
             devices[x].BL_Version = buf[7];
@@ -749,7 +749,7 @@ OP_DFU::Status DFUObject::UploadFirmwareT(const QString &sfile, const bool &veri
         pad = pad - arr.length();
         arr.append(QByteArray(pad, 255));
     }
-    if (devices[device].SizeOfCode < arr.length()) {
+    if (devices[device].SizeOfCode < (quint32)arr.length()) {
         if (debug) {
             qDebug() << "ERROR file to big for device";
         }
diff --git a/ground/openpilotgcs/src/plugins/uploader/op_dfu.h b/ground/openpilotgcs/src/plugins/uploader/op_dfu.h
index 33cef9abb..346582872 100644
--- a/ground/openpilotgcs/src/plugins/uploader/op_dfu.h
+++ b/ground/openpilotgcs/src/plugins/uploader/op_dfu.h
@@ -115,7 +115,7 @@ public:
     // DFUObject(bool debug);
     DFUObject(bool debug, bool use_serial, QString port);
 
-    ~DFUObject();
+    virtual ~DFUObject();
 
     // Service commands:
     bool enterDFU(int const &devNumber);