diff --git a/src/FirmwarePlugin/FirmwarePlugin.h b/src/FirmwarePlugin/FirmwarePlugin.h
index 6cb5322..f97470d 100644
--- a/src/FirmwarePlugin/FirmwarePlugin.h
+++ b/src/FirmwarePlugin/FirmwarePlugin.h
@@ -151,13 +151,13 @@ public:
     virtual double minimumTakeoffAltitude(Vehicle* /*vehicle*/) { return 10; }
 
     /// @return The maximum horizontal groundspeed for a multirotor.
-    virtual double maximumHorizontalSpeedMultirotor(Vehicle* /*vehicle*/) { return 10; }
+    virtual double maximumHorizontalSpeedMultirotor(Vehicle* /*vehicle*/) { return NAN; }
 
     /// @return The maximum equivalent airspeed setpoint.
-    virtual double maximumEquivalentAirspeed(Vehicle* /*vehicle*/) { return 25; }
+    virtual double maximumEquivalentAirspeed(Vehicle* /*vehicle*/) { return NAN; }
 
     /// @return The minimum equivalent airspeed setpoint
-    virtual double minimumEquivalentAirspeed(Vehicle* /*vehicle*/) { return 12; }
+    virtual double minimumEquivalentAirspeed(Vehicle* /*vehicle*/) { return NAN; }
 
     /// Command the vehicle to start the mission
     virtual void startMission(Vehicle* vehicle);
diff --git a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
index 93c0e2f..8b1bbfe 100644
--- a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
+++ b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
@@ -415,9 +415,9 @@ double PX4FirmwarePlugin::maximumHorizontalSpeedMultirotor(Vehicle* vehicle)
 
     if (vehicle->parameterManager()->parameterExists(FactSystem::defaultComponentId, speedParam)) {
         return vehicle->parameterManager()->getParameter(FactSystem::defaultComponentId, speedParam)->rawValue().toDouble();
-    } else {
-        return FirmwarePlugin::maximumHorizontalSpeedMultirotor(vehicle);
     }
+
+    return FirmwarePlugin::maximumHorizontalSpeedMultirotor(vehicle);
 }
 
 double PX4FirmwarePlugin::maximumEquivalentAirspeed(Vehicle* vehicle)
@@ -426,9 +426,9 @@ double PX4FirmwarePlugin::maximumEquivalentAirspeed(Vehicle* vehicle)
 
     if (vehicle->parameterManager()->parameterExists(FactSystem::defaultComponentId, airspeedMax)) {
         return vehicle->parameterManager()->getParameter(FactSystem::defaultComponentId, airspeedMax)->rawValue().toDouble();
-    } else {
-        return FirmwarePlugin::maximumEquivalentAirspeed(vehicle);
     }
+
+    return FirmwarePlugin::maximumEquivalentAirspeed(vehicle);
 }
 
 double PX4FirmwarePlugin::minimumEquivalentAirspeed(Vehicle* vehicle)
@@ -437,9 +437,9 @@ double PX4FirmwarePlugin::minimumEquivalentAirspeed(Vehicle* vehicle)
 
     if (vehicle->parameterManager()->parameterExists(FactSystem::defaultComponentId, airspeedMin)) {
         return vehicle->parameterManager()->getParameter(FactSystem::defaultComponentId, airspeedMin)->rawValue().toDouble();
-    } else {
-        return FirmwarePlugin::minimumEquivalentAirspeed(vehicle);
     }
+
+    return FirmwarePlugin::minimumEquivalentAirspeed(vehicle);
 }
 
 void PX4FirmwarePlugin::guidedModeGotoLocation(Vehicle* vehicle, const QGeoCoordinate& gotoCoord)
diff --git a/src/FlightDisplay/GuidedActionsController.qml b/src/FlightDisplay/GuidedActionsController.qml
index 84a24bf..b242d59 100644
--- a/src/FlightDisplay/GuidedActionsController.qml
+++ b/src/FlightDisplay/GuidedActionsController.qml
@@ -47,7 +47,7 @@ Item {
     readonly property string pauseTitle:                    qsTr("Pause")
     readonly property string mvPauseTitle:                  qsTr("Pause (MV)")
     readonly property string changeAltTitle:                qsTr("Change Altitude")
-    readonly property string changeCruiseSpeedTitle:        qsTr("Change Cruise Speed")
+    readonly property string changeCruiseSpeedTitle:        qsTr("Change Max Ground Speed")
     readonly property string changeAirspeedTitle:           qsTr("Change Airspeed")
     readonly property string orbitTitle:                    qsTr("Orbit")
     readonly property string landAbortTitle:                qsTr("Land Abort")
@@ -487,7 +487,6 @@ Item {
             actionList.show()
             return
         case actionChangeSpeed:
-            confirmDialog.title = "Change Speed"
             confirmDialog.hideTrigger = true
             confirmDialog.title = changeSpeedTitle
             confirmDialog.message = changeSpeedMessage