diff --git a/src/PlanView/PlanStartOverlay.qml b/src/PlanView/PlanStartOverlay.qml
index e830270756b675e78b40f31de1b97eb48c33c39a..6475f5ad5370e87bf14021c159b1aedd8b22d898 100644
--- a/src/PlanView/PlanStartOverlay.qml
+++ b/src/PlanView/PlanStartOverlay.qml
@@ -8,7 +8,7 @@
  ****************************************************************************/
 
 import QtQuick              2.3
-import QtQuick.Controls     2.11
+import QtQuick.Controls     2.4
 import QtQuick.Layouts      1.2
 
 import QGroundControl               1.0
diff --git a/src/comm/MAVLinkProtocol.cc b/src/comm/MAVLinkProtocol.cc
index 5e43702c96d2b08dec0d2664e1570d231d8cf529..6190f7eadda5fcfd857c587572d15608fc727ef9 100644
--- a/src/comm/MAVLinkProtocol.cc
+++ b/src/comm/MAVLinkProtocol.cc
@@ -394,7 +394,7 @@ void MAVLinkProtocol::setSystemId(int id)
 /** @return Component id of this application */
 int MAVLinkProtocol::getComponentId()
 {
-    return 0;
+    return MAV_COMP_ID_MISSIONPLANNER;
 }
 
 void MAVLinkProtocol::enableVersionCheck(bool enabled)