diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index a338d43cbeadaa4e576de160ea924da418e7ca32..3a6e0763676bd2628608f5aadb9d585328146a8b 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -155,6 +155,7 @@ UAS::UAS(MAVLinkProtocol* protocol, QThread* thread, int id) : UASInterface(),
     paramsOnceRequested(false),
     paramMgr(this),
     simulation(0),
+    _thread(thread),
 
     // The protected members.
     connectionLost(false),
@@ -164,8 +165,7 @@ UAS::UAS(MAVLinkProtocol* protocol, QThread* thread, int id) : UASInterface(),
     hilEnabled(false),
     sensorHil(false),
     lastSendTimeGPS(0),
-    lastSendTimeSensors(0),
-    _thread(thread)
+    lastSendTimeSensors(0)
 {
     moveToThread(thread);
 
diff --git a/src/ui/PrimaryFlightDisplay.cc b/src/ui/PrimaryFlightDisplay.cc
index 7997a1d3f1190203d9703d66e2b43ecb59809569..c22fbf30efa2d396ed3c958fea20155c5a57ffa1 100644
--- a/src/ui/PrimaryFlightDisplay.cc
+++ b/src/ui/PrimaryFlightDisplay.cc
@@ -110,6 +110,9 @@ const QString PrimaryFlightDisplay::compassWindNames[] = {
 PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *parent) :
     QWidget(parent),
 
+    _valuesChanged(false),
+    _valuesLastPainted(QGC::groundTimeMilliseconds()),
+
     uas(NULL),
 
     roll(0),
@@ -141,9 +144,7 @@ PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *paren
     instrumentOpagueBackground(QColor::fromHsvF(0, 0, 0.3, 1.0)),
 
     font("Bitstream Vera Sans"),
-    refreshTimer(new QTimer(this)),
-    _valuesChanged(false),
-    _valuesLastPainted(QGC::groundTimeMilliseconds())
+    refreshTimer(new QTimer(this))
 {
     Q_UNUSED(width);
     Q_UNUSED(height);