diff --git a/src/MissionEditor/GeoFenceMapVisuals.qml b/src/MissionEditor/GeoFenceMapVisuals.qml
index 584d528523d924a728173b5c9e6d2e68589676ff..0988080daccc1c9e533549e4318a4dd4aac51453 100644
--- a/src/MissionEditor/GeoFenceMapVisuals.qml
+++ b/src/MissionEditor/GeoFenceMapVisuals.qml
@@ -146,7 +146,7 @@ Item {
             border.width:   2
             border.color:   "orange"
             color:          "transparent"
-            center:         homePosition ? homePosition : undefined
+            center:         homePosition ? homePosition : QtPositioning.coordinate()
             radius:         myGeoFenceController.circleRadius
             visible:        planView || geoFenceController.circleEnabled
         }
diff --git a/src/MissionEditor/SurveyMapVisual.qml b/src/MissionEditor/SurveyMapVisual.qml
index 593a9dafb2b594dfa9f9f021284642dc1204cde1..5abbef78d855dfa3c635a0d24f4afcaa3209e848 100644
--- a/src/MissionEditor/SurveyMapVisual.qml
+++ b/src/MissionEditor/SurveyMapVisual.qml
@@ -72,11 +72,13 @@ Item {
     function _addInitialPolygon() {
         if (_missionItem.polygonPath.length < 3) {
             // Initial polygon is inset to take 2/3rds space
-            var rect = map.centerViewport
+            var rect = Qt.rect(map.centerViewport.x, map.centerViewport.y, map.centerViewport.width, map.centerViewport.height)
+            console.log(map.centerViewport)
             rect.x += (rect.width * 0.25) / 2
             rect.y += (rect.height * 0.25) / 2
             rect.width *= 0.75
             rect.height *= 0.75
+            console.log(map.centerViewport)
             var topLeft = Qt.point(rect.x, rect.y)
             var topRight = Qt.point(rect.x + rect.width, rect.y)
             var bottomLeft = Qt.point(rect.x, rect.y + rect.height)