diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index 910a20f..4a13920 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -84,9 +84,9 @@ Item {
             
             delegate:
                 VehicleMapItem {
+                        vehicle:        object
                         coordinate:     object.coordinate
-                        heading:        object.heading
-                        isSatellite:    isSatelliteMap
+                        isSatellite:    flightMap.isSatelliteMap
                 }
         }
 
@@ -124,7 +124,7 @@ Item {
             id:                 missionItemSummaryList
             anchors.margins:    ScreenTools.defaultFontPixelWidth
             anchors.left:       parent.left
-            anchors.right:      mapWidgets.left
+            anchors.right:      flightMap.mapWidgets.left
             anchors.bottom:     parent.bottom
             height:             ScreenTools.defaultFontPixelHeight * 7
             spacing:            ScreenTools.defaultFontPixelWidth / 2
diff --git a/src/FlightMap/MapItems/VehicleMapItem.qml b/src/FlightMap/MapItems/VehicleMapItem.qml
index d15c0a7..2b8dcea 100644
--- a/src/FlightMap/MapItems/VehicleMapItem.qml
+++ b/src/FlightMap/MapItems/VehicleMapItem.qml
@@ -24,8 +24,9 @@ This file is part of the QGROUNDCONTROL project
 /// @file
 ///     @author Don Gagne <don@thegagnes.com>
 
-import QtQuick      2.4
-import QtLocation   5.3
+import QtQuick          2.4
+import QtLocation       5.3
+import QtPositioning    5.3
 
 import QGroundControl.ScreenTools   1.0
 import QGroundControl.Vehicle       1.0
@@ -37,7 +38,6 @@ MapQuickItem {
 
     anchorPoint.x:  vehicleIcon.width  / 2
     anchorPoint.y:  vehicleIcon.height / 2
-    coordinate:     vehicle.coordinate
     visible:        vehicle.satelliteLock >= 2  // 2D lock
 
     sourceItem: Image {