diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponent.qml b/src/AutoPilotPlugins/APM/APMSensorsComponent.qml
index 7c7e3eef71e11b8969930b1c6765914cd760c455..fd0a6ac1b1c29570109ef64eec22c5733e6b35e3 100644
--- a/src/AutoPilotPlugins/APM/APMSensorsComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMSensorsComponent.qml
@@ -45,7 +45,6 @@ SetupPage {
             readonly property string gyroHelp:      "For Gyroscope calibration you will need to place your vehicle on a surface and leave it still."
             readonly property string accelHelp:     "For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds."
             readonly property string levelHelp:     "To level the horizon you need to place the vehicle in its level flight position and press OK."
-            readonly property string airspeedHelp:  "For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor."
 
             readonly property string statusTextAreaDefaultText: "Start the individual calibration steps by clicking one of the buttons to the left."
 
@@ -466,7 +465,7 @@ SetupPage {
 
                         readonly property string _altText:      _activeVehicle.sub ? qsTr("depth") : qsTr("altitude")
                         readonly property string _helpText:     qsTr("Pressure calibration will set the %1 to zero at the current pressure reading. %2").arg(_altText).arg(_helpTextFW)
-                        readonly property string _helpTextFW:   _activeVehicle.fixedWing ? qsTr("Cover airspeed sensor for calibration.") : ""
+                        readonly property string _helpTextFW:   _activeVehicle.fixedWing ? qsTr("To calibrate the airspeed sensor shield it from the wind. Do not touch the sensor or obstruct any holes during the calibration.") : ""
                     }
                 } // QGCViewDialog
             } // Component - calibratePressureDialogComponent
diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.qml b/src/AutoPilotPlugins/PX4/SensorsComponent.qml
index c3e2b1b214de5b120ea8bf7bd6afa41d2162655d..252f186f88aaa6daf6385672338bdf98e3bf0b5c 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponent.qml
+++ b/src/AutoPilotPlugins/PX4/SensorsComponent.qml
@@ -41,7 +41,7 @@ SetupPage {
             readonly property string gyroHelp:      qsTr("For Gyroscope calibration you will need to place your vehicle on a surface and leave it still. Click Ok to start calibration.")
             readonly property string accelHelp:     qsTr("For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds. Click Ok to start calibration.")
             readonly property string levelHelp:     qsTr("To level the horizon you need to place the vehicle in its level flight position and press OK.")
-            readonly property string airspeedHelp:  qsTr("For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor.")
+            readonly property string airspeedHelp:  qsTr("For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor. Do not touch the sensor or obstruct any holes during the calibration.")
 
             readonly property string statusTextAreaDefaultText: qsTr("Start the individual calibration steps by clicking one of the buttons to the left.")
 
diff --git a/src/PlanView/SurveyItemEditor.qml b/src/PlanView/SurveyItemEditor.qml
index 5f6bd5068bac39d9f5ed14804f8e98ccff4758cf..e5fed5d0137a4f6865e0eedd0d1a6ed127f99fae 100644
--- a/src/PlanView/SurveyItemEditor.qml
+++ b/src/PlanView/SurveyItemEditor.qml
@@ -51,8 +51,8 @@ Rectangle {
                 }
             }
             missionItem.cameraOrientationFixed = false
-            if (index == -1) {
-                gridTypeCombo.currentIndex = _gridTypeManual
+            if (index == _cameraList.length) {
+                gridTypeCombo.currentIndex = _gridTypeCustomCamera
             } else {
                 gridTypeCombo.currentIndex = index
                 if (index != 1) {
diff --git a/src/comm/QGCXPlaneLink.cc b/src/comm/QGCXPlaneLink.cc
index 247e7efa29913fc8aa726b76386aaad02b47faa2..ea5c8f8148f4f7142f6c6e584b6f16ba784f5e54 100644
--- a/src/comm/QGCXPlaneLink.cc
+++ b/src/comm/QGCXPlaneLink.cc
@@ -635,9 +635,10 @@ void QGCXPlaneLink::readBytes()
 
             if (p.index == 3)
             {
-                ind_airspeed = p.f[5] * 0.44704f;
-                true_airspeed = p.f[6] * 0.44704f;
-                groundspeed = p.f[7] * 0.44704;
+                float knotsToMetersPerSecond = 0.514444f;
+                ind_airspeed = p.f[5] * knotsToMetersPerSecond;
+                true_airspeed = p.f[6] * knotsToMetersPerSecond;
+                groundspeed = p.f[7] * knotsToMetersPerSecond;
 
                 //qDebug() << "SPEEDS:" << "airspeed" << airspeed << "m/s, groundspeed" << groundspeed << "m/s";
             }