diff --git a/src/uas/SlugsMAV.cc b/src/uas/SlugsMAV.cc
index 5fcbc0fadc206ec59f7149aab595aa8ce02c19d0..277a5215616656683cc8e6978bab39f08a276be2 100644
--- a/src/uas/SlugsMAV.cc
+++ b/src/uas/SlugsMAV.cc
@@ -67,7 +67,7 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
                 emit valueChanged(uasId, tr("ControlDSC Load"), cpu_load.ctrlLoad, time);
                 emit valueChanged(uasId, tr("Battery Volt"), cpu_load.batVolt, time);
 
-                emit newCpuLoad (uasId, &cpu_load);
+                //emit newCpuLoad (uasId, &cpu_load);
 
             break;
         }
diff --git a/src/ui/MapWidget.cc b/src/ui/MapWidget.cc
index f866f7fc7fdcb9c3cf6421cb613bc052652acc54..14120f79bddb668833ee6ca4dc0ed40c39bd777d 100644
--- a/src/ui/MapWidget.cc
+++ b/src/ui/MapWidget.cc
@@ -340,10 +340,19 @@ void MapWidget::createPathButtonClicked(bool checked)
 
 }
 
+/**
+ * Captures a click on the map and if in create WP path mode, it adds the WP on MouseButtonRelease
+ *
+ * @param event The mouse event
+ * @param coordinate The coordinate in which it occured the mouse event
+ * @note  This slot is connected to the mouseEventCoordinate of the QMapControl object
+ */
 
 void MapWidget::captureMapClick(const QMouseEvent* event, const QPointF coordinate)
 {
 
+  qDebug() << mc->mouseMode();
+
   if (QEvent::MouseButtonRelease == event->type() && createPath->isChecked())
     {
     // Create waypoint name
@@ -403,6 +412,7 @@ void MapWidget::createWaypointGraphAtMap(const QPointF coordinate)
 //    emit captureMapCoordinateClick(coordinate);
 }
 
+
 void MapWidget::captureGeometryClick(Geometry* geom, QPoint point)
 {
   Q_UNUSED(geom);
@@ -414,7 +424,7 @@ void MapWidget::captureGeometryClick(Geometry* geom, QPoint point)
 
 void MapWidget::captureGeometryDrag(Geometry* geom, QPointF coordinate)
 {
-  Q_UNUSED(coordinate);
+
 
   waypointIsDrag = true;
 
@@ -445,13 +455,15 @@ void MapWidget::captureGeometryDrag(Geometry* geom, QPointF coordinate)
 
 void MapWidget::captureGeometryEndDrag(Geometry* geom, QPointF coordinate)
 {
-    waypointIsDrag = false;
 
+  // TODO: Investigate why when creating the waypoint path this slot is being called
+
+  // Only change the mouse mode back to panning when not creating a WP path
+  if (!createPath->isChecked()){
+    waypointIsDrag = false;
     mc->setMouseMode(qmapcontrol::MapControl::Panning);
+  }
 
-//  qDebug() << geom->name();
-//  qDebug() << geom->GeometryType;
-//  qDebug() << point;
 }
 
 MapWidget::~MapWidget()
diff --git a/src/ui/MapWidget.h b/src/ui/MapWidget.h
index 450ed255f1d7a0ad141d736254845d17447f81a2..cb6025c04cbd02b652f562d52bb6178a49826f13 100644
--- a/src/ui/MapWidget.h
+++ b/src/ui/MapWidget.h
@@ -107,13 +107,15 @@ protected:
 
   protected slots:
     void captureMapClick (const QMouseEvent* event, const QPointF coordinate);
-    void createWaypointGraphAtMap (const QPointF coordinate);
-    void createPathButtonClicked(bool checked);
     void captureGeometryClick(Geometry*, QPoint);
-    void mapproviderSelected(QAction* action);
     void captureGeometryDrag(Geometry* geom, QPointF coordinate);
     void captureGeometryEndDrag(Geometry* geom, QPointF coordinate);
 
+    void createPathButtonClicked(bool checked);
+
+    void createWaypointGraphAtMap (const QPointF coordinate);
+    void mapproviderSelected(QAction* action);
+