diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml
index 324bcb8ba43cca1b22dbf6fecd5219dbc05adbd5..a61aa64575dddf9fd50821eb483ae18abfc1deff 100644
--- a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml
+++ b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml
@@ -21,16 +21,16 @@ Column {
 
     VehicleSummaryRow {
         labelText: "Position Ctl switch:"
-        valueText: posCtlSwFact.value == 0 ? "Disabled" : fact.valueString
+        valueText: posCtlSwFact.value == 0 ? "Disabled" : posCtlSwFact.valueString
     }
 
     VehicleSummaryRow {
-        labelText: "Position Ctl switch:"
-        valueText: loiterSwFact.value == 0 ? "Disabled" : fact.valueString
+        labelText: "Loiter switch:"
+        valueText: loiterSwFact.value == 0 ? "Disabled" : loiterSwFact.valueString
     }
 
     VehicleSummaryRow {
         labelText: "Return switch:"
-        valueText: returnSwFact.value == 0 ? "Disabled" : fact.valueString
+        valueText: returnSwFact.value == 0 ? "Disabled" : returnSwFact.valueString
     }
 }
diff --git a/src/qgcunittest/MockLink.param b/src/qgcunittest/MockLink.param
index 9f9e0c6185c28177ed05f0d180c3dfd9affa34f5..36588f4d55be98b7e8cb91a728997f8879890f63 100644
--- a/src/qgcunittest/MockLink.param
+++ b/src/qgcunittest/MockLink.param
@@ -439,20 +439,20 @@
 1	50	RC_FAILS_THR	0	6
 1	50	RC_LOITER_TH	                      0.5	9
 1	50	RC_MAP_ACRO_SW	0	6
-1	50	RC_MAP_AUX1	0	6
-1	50	RC_MAP_AUX2	0	6
+1	50	RC_MAP_AUX1	11	6
+1	50	RC_MAP_AUX2	12	6
 1	50	RC_MAP_AUX3	0	6
 1	50	RC_MAP_FAILSAFE	0	6
-1	50	RC_MAP_FLAPS	0	6
-1	50	RC_MAP_LOITER_SW	0	6
+1	50	RC_MAP_FLAPS	10	6
+1	50	RC_MAP_LOITER_SW	9	6
 1	50	RC_MAP_MODE_SW	6	6
 1	50	RC_MAP_OFFB_SW	0	6
 1	50	RC_MAP_PARAM1	0	6
 1	50	RC_MAP_PARAM2	0	6
 1	50	RC_MAP_PARAM3	0	6
 1	50	RC_MAP_PITCH	2	6
-1	50	RC_MAP_POSCTL_SW	0	6
-1	50	RC_MAP_RETURN_SW	0	6
+1	50	RC_MAP_POSCTL_SW	7	6
+1	50	RC_MAP_RETURN_SW	8	6
 1	50	RC_MAP_ROLL	1	6
 1	50	RC_MAP_THROTTLE	3	6
 1	50	RC_MAP_YAW	4	6