diff --git a/src/comm/LinkInterface.h b/src/comm/LinkInterface.h
index 833a804a9c60f51d5df0060cd06c2eb5da467f21..3335677522895aa2cf1a03972cf8903a09738531 100644
--- a/src/comm/LinkInterface.h
+++ b/src/comm/LinkInterface.h
@@ -36,6 +36,7 @@ along with PIXHAWK. If not, see <http://www.gnu.org/licenses/>.
 #include <QDateTime>
 #include <QMutex>
 #include <QMutexLocker>
+#include <QMetaType>
 
 /**
 * The link interface defines the interface for all links used to communicate
@@ -62,6 +63,7 @@ public:
             outDataWriteTimes[i] = 0;
         }
 
+        qRegisterMetaType<LinkInterface*>("LinkInterface*");
     }
 
     virtual ~LinkInterface() {
diff --git a/src/qgcunittest/UASUnitTest.cc b/src/qgcunittest/UASUnitTest.cc
index 2fc948c2469a59f471e6e5726b4008507405137f..7167579b9157cafd6e9e5feadd8272a0a8e2a81d 100644
--- a/src/qgcunittest/UASUnitTest.cc
+++ b/src/qgcunittest/UASUnitTest.cc
@@ -1,6 +1,8 @@
 #include "UASUnitTest.h"
 #include <stdio.h>
 #include <QObject>
+#include <QThread>
+
 UASUnitTest::UASUnitTest()
 {
 }
@@ -8,7 +10,7 @@ UASUnitTest::UASUnitTest()
 void UASUnitTest::init()
 {
     mav = new MAVLinkProtocol();
-    uas = new UAS(mav, UASID);
+    uas = new UAS(mav, QThread::currentThread(), UASID);
     uas->deleteSettings();
 }
 //this function is called after every test
@@ -24,7 +26,7 @@ void UASUnitTest::cleanup()
 void UASUnitTest::getUASID_test()
 {
     // Test a default ID of zero is assigned
-    UAS* uas2 = new UAS(mav);
+    UAS* uas2 = new UAS(mav, QThread::currentThread());
     QCOMPARE(uas2->getUASID(), 0);
     delete uas2;
 
@@ -49,7 +51,7 @@ void UASUnitTest::getUASName_test()
 
 void UASUnitTest::getUpTime_test()
 {
-    UAS* uas2 = new UAS(mav);
+    UAS* uas2 = new UAS(mav, QThread::currentThread());
     // Test that the uptime starts at zero to a
     // precision of seconds
     QCOMPARE(floor(uas2->getUptime()/1000.0), 0.0);
@@ -281,7 +283,7 @@ void UASUnitTest::signalWayPoint_test()
     delete uas;// delete(destroyed) uas for validating
     uas = NULL;
     QCOMPARE(spyDestroyed.count(), 1);// count destroyed uas should are 1
-    uas = new UAS(mav,UASID);
+    uas = new UAS(mav, QThread::currentThread(), UASID);
     QSignalSpy spy2(uas->getWaypointManager(), SIGNAL(waypointEditableListChanged()));
     QCOMPARE(spy2.count(), 0);
     Waypoint* wp2 = new Waypoint(0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,false, false, MAV_FRAME_GLOBAL, MAV_CMD_MISSION_START, "blah");