diff --git a/src/FactSystem/FactSystemTest.qml b/src/FactSystem/FactSystemTest.qml
index a9155de820182676aebf6f85c9cb44f9a8e09635..8ac4d9ada73ac7759b67e27573bd4d3b462b69c9 100644
--- a/src/FactSystem/FactSystemTest.qml
+++ b/src/FactSystem/FactSystemTest.qml
@@ -32,7 +32,7 @@ FactPanel {
     TextInput {
         text:       fact2.value
 
-        property Fact fact2: controller.getParameterFact(1, "RC_MAP_THROTTLE")
+        property Fact fact2: controller.getParameterFact(200, "RC_MAP_THROTTLE")
 
         onAccepted: fact2.value = text
     }
diff --git a/src/FactSystem/FactSystemTestBase.cc b/src/FactSystem/FactSystemTestBase.cc
index 58fbe6ea8ecb12caa4af64dd371279cfddca568c..35f920229c75525a020779519bf4127f9e11b170 100644
--- a/src/FactSystem/FactSystemTestBase.cc
+++ b/src/FactSystem/FactSystemTestBase.cc
@@ -58,8 +58,8 @@ void FactSystemTestBase::_parameter_default_component_id_test(void)
 
 void FactSystemTestBase::_parameter_specific_component_id_test(void)
 {
-    QVERIFY(_vehicle->parameterManager()->parameterExists(1, "RC_MAP_THROTTLE"));
-    Fact* fact = _vehicle->parameterManager()->getParameter(1, "RC_MAP_THROTTLE");
+    QVERIFY(_vehicle->parameterManager()->parameterExists(200, "RC_MAP_THROTTLE"));
+    Fact* fact = _vehicle->parameterManager()->getParameter(200, "RC_MAP_THROTTLE");
     QVERIFY(fact != NULL);
     QVariant factValue = fact->rawValue();
     QCOMPARE(factValue.isValid(), true);
diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index 886330ca93c5b2a874668c0bf78dc41e9ac11bc2..6c2fc34d406761b6905e620d46cb8e40ab6b8cae 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -828,6 +828,10 @@ void Vehicle::_handleHomePosition(mavlink_message_t& message)
 
 void Vehicle::_handleHeartbeat(mavlink_message_t& message)
 {
+    if (message.compid != _defaultComponentId) {
+        return;
+    }
+
     _connectionActive();
 
     mavlink_heartbeat_t heartbeat;
diff --git a/src/comm/MockLink.cc b/src/comm/MockLink.cc
index 24def6a8a3820a14f6aa8d67fd98cf37f2c40d9b..b3cd24ff6d4720a184c8f62e6d2ce1437d4c4898 100644
--- a/src/comm/MockLink.cc
+++ b/src/comm/MockLink.cc
@@ -215,7 +215,6 @@ void MockLink::_loadParams(void)
         QStringList paramData = line.split("\t");
         Q_ASSERT(paramData.count() == 5);
 
-        int componentId = paramData.at(1).toInt();
         QString paramName = paramData.at(2);
         QString valStr = paramData.at(3);
         uint paramType = paramData.at(4).toUInt();
@@ -251,7 +250,7 @@ void MockLink::_loadParams(void)
 
         qCDebug(MockLinkVerboseLog) << "Loading param" << paramName << paramValue;
 
-        _mapParamName2Value[componentId][paramName] = paramValue;
+        _mapParamName2Value[_vehicleComponentId][paramName] = paramValue;
         _mapParamName2MavParamType[paramName] = static_cast<MAV_PARAM_TYPE>(paramType);
     }
 }