diff --git a/ground/openpilotgcs/src/plugins/opmap/modeluavoproxy.cpp b/ground/openpilotgcs/src/plugins/opmap/modeluavoproxy.cpp
index 8d28bc35e..d11ee753b 100644
--- a/ground/openpilotgcs/src/plugins/opmap/modeluavoproxy.cpp
+++ b/ground/openpilotgcs/src/plugins/opmap/modeluavoproxy.cpp
@@ -74,7 +74,7 @@ void modelUavoProxy::modelToObjects()
         index=myModel->index(x,flightDataModel::ALTITUDERELATIVE);
         altitude=myModel->data(index).toFloat();
         index=myModel->index(x,flightDataModel::VELOCITY);
-        waypoint.Velocity[0]=myModel->data(index).toFloat();
+        waypoint.Velocity=myModel->data(index).toFloat();
 
         waypoint.Position[Waypoint::POSITION_NORTH]=distance*cos(bearing/180*M_PI);
         waypoint.Position[Waypoint::POSITION_EAST]=distance*sin(bearing/180*M_PI);
diff --git a/ground/openpilotgcs/src/plugins/opmap/opmap.pro b/ground/openpilotgcs/src/plugins/opmap/opmap.pro
index 1524fdfca..6b30dfe97 100644
--- a/ground/openpilotgcs/src/plugins/opmap/opmap.pro
+++ b/ground/openpilotgcs/src/plugins/opmap/opmap.pro
@@ -18,8 +18,11 @@ HEADERS += opmapplugin.h \
     opmap_edit_waypoint_dialog.h \
     opmap_zoom_slider_widget.h \
     opmap_statusbar_widget.h \
+    flightdatamodel.h \
     modelmapproxy.h \
     widgetdelegates.h \
+    pathplanner.h \
+    modeluavoproxy.h \
     homeeditor.h
 
 SOURCES += opmapplugin.cpp \
@@ -31,8 +34,11 @@ SOURCES += opmapplugin.cpp \
     opmap_edit_waypoint_dialog.cpp \
     opmap_zoom_slider_widget.cpp \
     opmap_statusbar_widget.cpp \
+    flightdatamodel.cpp \
     modelmapproxy.cpp \
     widgetdelegates.cpp \
+    pathplanner.cpp \
+    modeluavoproxy.cpp \
     homeeditor.cpp
 
 OTHER_FILES += OPMapGadget.pluginspec