diff --git a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/qssp.cpp b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/qssp.cpp
index aadd01330..7944449ed 100644
--- a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/qssp.cpp
+++ b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/qssp.cpp
@@ -21,7 +21,7 @@
 // Make larger sized integers from smaller sized integers
 #define MAKEWORD16(ub, lb)          ((uint16_t)0x0000 | ((uint16_t)(ub) << 8) | (uint16_t)(lb))
 #define MAKEWORD32(uw, lw)          ((uint32_t)(0x0UL | ((uint32_t)(uw) << 16) | (uint32_t)(lw)))
-#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0))
+#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0)))
 
 
 // Used to extract smaller integers from larger sized intergers
diff --git a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/ssp.cpp b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/ssp.cpp
index 385178312..03d6dc89f 100644
--- a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/ssp.cpp
+++ b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/ssp.cpp
@@ -91,7 +91,7 @@
 // Make larger sized integers from smaller sized integers
 #define MAKEWORD16(ub, lb)          ((uint16_t)0x0000 | ((uint16_t)(ub) << 8) | (uint16_t)(lb))
 #define MAKEWORD32(uw, lw)          ((uint32_t)(0x0UL | ((uint32_t)(uw) << 16) | (uint32_t)(lw)))
-#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0))
+#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0)))
 
 
 // Used to extract smaller integers from larger sized intergers
diff --git a/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry.cpp b/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry.cpp
index 70b4ab5f1..faf1d7fdb 100644
--- a/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry.cpp
+++ b/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry.cpp
@@ -147,7 +147,7 @@ template<typename Scalar> void geometry(void)
   t1.setIdentity();
   t1.linear() = q1.toRotationMatrix();
 
-  v0 << 50, 2, 1;//= ei_random_matrix<Vector3>().cwiseProduct(Vector3(10,2,0.5));
+  v0 << 50, 2, 1; // = ei_random_matrix<Vector3>().cwiseProduct(Vector3(10,2,0.5));
   t0.scale(v0);
   t1.prescale(v0);
 
diff --git a/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry_with_eigen2_prefix.cpp b/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry_with_eigen2_prefix.cpp
index f83b57249..9ff9f4026 100644
--- a/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry_with_eigen2_prefix.cpp
+++ b/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry_with_eigen2_prefix.cpp
@@ -149,7 +149,7 @@ template<typename Scalar> void geometry(void)
   t1.setIdentity();
   t1.linear() = q1.toRotationMatrix();
 
-  v0 << 50, 2, 1;//= ei_random_matrix<Vector3>().cwiseProduct(Vector3(10,2,0.5));
+  v0 << 50, 2, 1; // = ei_random_matrix<Vector3>().cwiseProduct(Vector3(10,2,0.5));
   t0.scale(v0);
   t1.prescale(v0);
 
diff --git a/ground/openpilotgcs/src/libs/utils/filesearch.cpp b/ground/openpilotgcs/src/libs/utils/filesearch.cpp
index 8a40e96c7..0c3249104 100644
--- a/ground/openpilotgcs/src/libs/utils/filesearch.cpp
+++ b/ground/openpilotgcs/src/libs/utils/filesearch.cpp
@@ -45,7 +45,7 @@ static inline QString msgCanceled(const QString &searchTerm, int numMatches, int
 {
     return QCoreApplication::translate("Utils::FileSearch",
                                        "%1: canceled. %n occurrences found in %2 files.",
-                                       0, numMatches).
+                                       NULL, numMatches).
            arg(searchTerm).arg(numFilesSearched);
 }
 
@@ -53,7 +53,7 @@ static inline QString msgFound(const QString &searchTerm, int numMatches, int nu
 {
     return QCoreApplication::translate("Utils::FileSearch",
                                        "%1: %n occurrences found in %2 files.",
-                                       0, numMatches).
+                                       NULL, numMatches).
            arg(searchTerm).arg(numFilesSearched);
 }
 
@@ -61,7 +61,7 @@ static inline QString msgFound(const QString &searchTerm, int numMatches, int nu
 {
     return QCoreApplication::translate("Utils::FileSearch",
                                        "%1: %n occurrences found in %2 of %3 files.",
-                                       0, numMatches).
+                                       NULL, numMatches).
            arg(searchTerm).arg(numFilesSearched).arg(filesSize);
 }
 
diff --git a/ground/openpilotgcs/src/libs/utils/xmlconfig.h b/ground/openpilotgcs/src/libs/utils/xmlconfig.h
index 98345e38d..0f92f0060 100644
--- a/ground/openpilotgcs/src/libs/utils/xmlconfig.h
+++ b/ground/openpilotgcs/src/libs/utils/xmlconfig.h
@@ -38,6 +38,7 @@
 #include <QObject>
 
 class XMLCONFIG_EXPORT XmlConfig : QObject {
+    Q_OBJECT
 public:
     static const QSettings::Format XmlSettingsFormat;
 
diff --git a/ground/openpilotgcs/src/plugins/uploader/SSP/qssp.cpp b/ground/openpilotgcs/src/plugins/uploader/SSP/qssp.cpp
index 517772ad9..3c68b0449 100644
--- a/ground/openpilotgcs/src/plugins/uploader/SSP/qssp.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/SSP/qssp.cpp
@@ -47,7 +47,7 @@
 // Make larger sized integers from smaller sized integers
 #define MAKEWORD16(ub, lb)          ((uint16_t)0x0000 | ((uint16_t)(ub) << 8) | (uint16_t)(lb))
 #define MAKEWORD32(uw, lw)          ((uint32_t)(0x0UL | ((uint32_t)(uw) << 16) | (uint32_t)(lw)))
-#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0))
+#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0)))
 
 
 // Used to extract smaller integers from larger sized intergers