diff --git a/src/FactSystem/FactControls/FactTextField.qml b/src/FactSystem/FactControls/FactTextField.qml
index 3430f3d9c55182413f3fef164c84d457cdcf5600..71d795fb789b35fa69e09dbf9628dd2594437235 100644
--- a/src/FactSystem/FactControls/FactTextField.qml
+++ b/src/FactSystem/FactControls/FactTextField.qml
@@ -21,7 +21,7 @@ QGCTextField {
     property string _validateString
 
     // At this point all Facts are numeric
-    inputMethodHints: (fact || fact.typeIsString || ScreenTools.isiOS) ?
+    inputMethodHints: ((fact && fact.typeIsString) || ScreenTools.isiOS) ?
                           Qt.ImhNone :                // iOS numeric keyboard has no done button, we can't use it
                           Qt.ImhFormattedNumbersOnly  // Forces use of virtual numeric keyboard
 
diff --git a/src/FirmwarePlugin/FirmwarePlugin.cc b/src/FirmwarePlugin/FirmwarePlugin.cc
index a573979a31e162fec5e4f700c9addfd93259d14f..0bb2acc1dbceaf69629bda0d8fb9b2ad27d75970 100644
--- a/src/FirmwarePlugin/FirmwarePlugin.cc
+++ b/src/FirmwarePlugin/FirmwarePlugin.cc
@@ -438,7 +438,7 @@ bool FirmwarePlugin::_armVehicle(Vehicle* vehicle)
     return vehicle->armed();
 }
 
-void FirmwarePlugin::batteryConsumptionData(Vehicle* vehicle, int& mAhBattery, int& hoverAmps, int& cruiseAmps) const
+void FirmwarePlugin::batteryConsumptionData(Vehicle* vehicle, int& mAhBattery, double& hoverAmps, double& cruiseAmps) const
 {
     Q_UNUSED(vehicle);
     mAhBattery = 0;
diff --git a/src/FirmwarePlugin/FirmwarePlugin.h b/src/FirmwarePlugin/FirmwarePlugin.h
index 06cdc935c40c657d9e5ed1a4b57b11c07c0b8a3c..034bcfedb87e1415dda5ea104eacd5bf5b29e6ff 100644
--- a/src/FirmwarePlugin/FirmwarePlugin.h
+++ b/src/FirmwarePlugin/FirmwarePlugin.h
@@ -280,7 +280,7 @@ public:
     ///     @param[out] mAhBattery Battery milliamp-hours rating (0 for no battery data available)
     ///     @param[out] hoverAmps Current draw in amps during hover
     ///     @param[out] cruiseAmps Current draw in amps during cruise
-    virtual void batteryConsumptionData(Vehicle* vehicle, int& mAhBattery, int& hoverAmps, int& cruiseAmps) const;
+    virtual void batteryConsumptionData(Vehicle* vehicle, int& mAhBattery, double& hoverAmps, double& cruiseAmps) const;
 
     // FIXME: Hack workaround for non pluginize FollowMe support
     static const char* px4FollowMeFlightMode;
diff --git a/src/MissionManager/MissionController.h b/src/MissionManager/MissionController.h
index f170b7a173412ae8ae2874e3f94741edbfe8bb6c..06751e8f6ca93bb8934e43fe7f2e1aa0fb0893a3 100644
--- a/src/MissionManager/MissionController.h
+++ b/src/MissionManager/MissionController.h
@@ -50,8 +50,8 @@ public:
         double  vehicleSpeed;           ///< Either cruise or hover speed based on vehicle type and vtol state
         double  gimbalYaw;              ///< NaN signals yaw was never changed
         int     mAhBattery;             ///< 0 for not available
-        int     hoverAmps;              ///< Amp consumption during hover
-        int     cruiseAmps;             ///< Amp consumption during cruise
+        double  hoverAmps;              ///< Amp consumption during hover
+        double  cruiseAmps;             ///< Amp consumption during cruise
         double  ampMinutesAvailable;    ///< Amp minutes available from single battery
         double  hoverAmpsTotal;         ///< Total hover amps used
         double  cruiseAmpsTotal;        ///< Total cruise amps used
diff --git a/src/PlanView/PlanToolBar.qml b/src/PlanView/PlanToolBar.qml
index 1cc3873f1d91a7f249c6d79c19bab3b90596db87..15b6b23bc206f011d06b9e7020b54bfb4e76c472 100644
--- a/src/PlanView/PlanToolBar.qml
+++ b/src/PlanView/PlanToolBar.qml
@@ -39,11 +39,6 @@ Rectangle {
     property bool   _controllerValid:           missionController != undefined
     property bool   _manualUpload:              QGroundControl.settingsManager.appSettings.automaticMissionUpload.rawValue == 0
 
-    Connections {
-        target: QGroundControl.settingsManager.appSettings.automaticMissionUpload
-        onRawValueChanged: console.log("changed", QGroundControl.settingsManager.appSettings.automaticMissionUpload.rawValue)
-    }
-
     property real   _largeValueWidth:           ScreenTools.defaultFontPixelWidth * 8
     property real   _smallValueWidth:           ScreenTools.defaultFontPixelWidth * 4
     property real   _labelToValueSpacing:       ScreenTools.defaultFontPixelWidth
diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
index a8b3d840d32efc8c6c1ac5db5554ca7eda3e2fdd..4e558375c20140b822ef0ebabf21908c7e34b005 100644
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -718,6 +718,7 @@ QGCView {
             // Mission Item Editor
             Item {
                 id:                 missionItemEditor
+                anchors.topMargin:  ScreenTools.defaultFontPixelHeight / 2
                 anchors.top:        planElementSelectorRow.visible ? planElementSelectorRow.bottom : planElementSelectorRow.top
                 anchors.left:       parent.left
                 anchors.right:      parent.right