diff --git a/src/uas/SlugsMAV.cc b/src/uas/SlugsMAV.cc
index f053345f2e77a6a0bad1abd83c4131119bc00ad6..443516de1347a2cf8c5b9cf720e37f5d65b510a9 100644
--- a/src/uas/SlugsMAV.cc
+++ b/src/uas/SlugsMAV.cc
@@ -30,7 +30,7 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
             break;
         }
 
-#ifdef MAVLINK_ENABLED_SLUGS_MESSAGES
+#ifdef MAVLINK_ENABLED_SLUGS_MESSAGES_QGC
 
     case MAVLINK_MSG_ID_CPU_LOAD:
         {
diff --git a/src/ui/WaypointList.cc b/src/ui/WaypointList.cc
index 25b7171d71b6d79ea2dd8b546c057511987f120a..17e29e140201c3ec8c7d1f5597083f093bcb8f7e 100644
--- a/src/ui/WaypointList.cc
+++ b/src/ui/WaypointList.cc
@@ -512,8 +512,8 @@ void WaypointList::setIsWPGlobal(bool value)
         if(wpViews.size()!= 0)
         {
 
-            int ret = QMessageBox::warning(this, tr("My Application"),
-                                    tr("There are Waypoints local created.\n"
+            int ret = QMessageBox::warning(this, tr("QGroundControl"),
+                                    tr("There are Local Waypoints created.\n"
                                        "Do you want to clear them?"),
                                     QMessageBox::Ok | QMessageBox::Cancel);