diff --git a/src/MissionManager/SurveyMissionItem.cc b/src/MissionManager/SurveyMissionItem.cc
index eb28e7ec78f02e00bafa01f7435642a3ea858df1..94520eefee252dd9d2e5d5b371e7ca56e5b3859b 100644
--- a/src/MissionManager/SurveyMissionItem.cc
+++ b/src/MissionManager/SurveyMissionItem.cc
@@ -747,7 +747,9 @@ void SurveyMissionItem::_generateGrid(void)
     _setSurveyDistance(surveyDistance);
 
     if (cameraShots == 0 && _triggerCamera()) {
-        cameraShots = (int)ceil(surveyDistance / _triggerDistance());
+        cameraShots = (int)floor(surveyDistance / _triggerDistance());
+        // Take into account immediate camera trigger at waypoint entry
+        cameraShots++;
     }
     _setCameraShots(cameraShots);
 
@@ -1065,7 +1067,9 @@ int SurveyMissionItem::_gridGenerator(const QList<QPointF>& polygonPoints,  QLis
     // Calc camera shots here if there are no images in turnaround
     if (_triggerCamera() && !_imagesEverywhere()) {
         for (int i=0; i<resultLines.count(); i++) {
-            cameraShots += (int)ceil(resultLines[i].length() / _triggerDistance());
+            cameraShots += (int)floor(resultLines[i].length() / _triggerDistance());
+            // Take into account immediate camera trigger at waypoint entry
+            cameraShots++;
         }
     }
 
diff --git a/src/PlanView/SurveyItemEditor.qml b/src/PlanView/SurveyItemEditor.qml
index 5f68e3dccdcfa2674edd1de43f3c6baa521b8a9f..9f417ffe7d6f68852233b7ac03d8b7ab358e8a43 100644
--- a/src/PlanView/SurveyItemEditor.qml
+++ b/src/PlanView/SurveyItemEditor.qml
@@ -584,6 +584,24 @@ Rectangle {
                 Layout.fillWidth:       true
             }
 
+            FactCheckBox {
+                text:               qsTr("Hover and capture image")
+                fact:               missionItem.hoverAndCapture
+                visible:            missionItem.hoverAndCaptureAllowed
+                Layout.columnSpan:  2
+                onClicked: {
+                    if (checked) {
+                        missionItem.cameraTriggerInTurnaround.rawValue = false
+                    }
+                }
+            }
+
+            FactCheckBox {
+                text:               qsTr("Take images in turnarounds")
+                fact:               missionItem.cameraTriggerInTurnaround
+                enabled:            !missionItem.hoverAndCapture.rawValue
+                Layout.columnSpan:  2
+            }
 
             QGCCheckBox {
                 text:               qsTr("Refly at 90 degree offset")
diff --git a/src/QtLocationPlugin/QMLControl/OfflineMap.qml b/src/QtLocationPlugin/QMLControl/OfflineMap.qml
index 2c7b04cb13f9379b64c886160cdccbe6e48fea4b..aa262b05065461bf57b87510f945ef24f8ac149d 100644
--- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml
+++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml
@@ -342,8 +342,6 @@ QGCView {
 
             property bool isSatelliteMap: activeMapType.name.indexOf("Satellite") > -1 || activeMapType.name.indexOf("Hybrid") > -1
 
-            plugin: Plugin { name: "QGroundControl" }
-
             MapRectangle {
                 id:             mapBoundary
                 border.width:   2