diff --git a/src/Wima/Snake/NemoInterface.cpp b/src/Wima/Snake/NemoInterface.cpp
index 671a3ccdcce7ba52ad9c944fa26de0ad402561d5..9b0927aeebf17b9cdd6f3daa9be71db45d0a4d03 100644
--- a/src/Wima/Snake/NemoInterface.cpp
+++ b/src/Wima/Snake/NemoInterface.cpp
@@ -248,6 +248,7 @@ bool NemoInterface::Impl::doTopicServiceSetup() {
           progressMsg.progress().clear();
           qgcApp()->showMessage("Invalid progress message received.");
         }
+        emit this->parent->progressChanged();
 
         lk1.unlock();
         lk2.unlock();
diff --git a/src/Wima/WimaController.cc b/src/Wima/WimaController.cc
index a35e2462bc1819d106403283f32dc6e2285a204e..7a9aa89ffc37dc2ad13ad0dda92661838f6b9736 100644
--- a/src/Wima/WimaController.cc
+++ b/src/Wima/WimaController.cc
@@ -90,11 +90,11 @@ MissionController *WimaController::missionController() {
 QmlObjectListModel *WimaController::visualItems() { return &_areas; }
 
 QmlObjectListModel *WimaController::missionItems() {
-  return const_cast<QmlObjectListModel *>(&_currentWM->missionItems());
+  return const_cast<QmlObjectListModel *>(&_currentWM->currentMissionItems());
 }
 
 QVariantList WimaController::waypointPath() {
-  return const_cast<QVariantList &>(_currentWM->waypointsVariant());
+  return const_cast<QVariantList &>(_currentWM->currentWaypointsVariant());
 }
 
 Fact *WimaController::enableWimaController() { return &_enableWimaController; }
diff --git a/src/Wima/WimaPlaner.cc b/src/Wima/WimaPlaner.cc
index 9451bfaa7a08632d3bbad24eb55dd0955abb43e6..65896d1522330c2fad19debdf29ba825626e19aa 100644
--- a/src/Wima/WimaPlaner.cc
+++ b/src/Wima/WimaPlaner.cc
@@ -144,8 +144,8 @@ void WimaPlaner::setProgressLocked(bool l) {
     this->_progressLocked = l;
     emit progressLockedChanged();
     if (!this->_progressLocked) {
-      this->_measurementArea.setProgress(this->_nemoInterface.progress());
-      this->_update();
+      if (this->_measurementArea.setProgress(this->_nemoInterface.progress()))
+        this->_update();
     }
   }
 }
diff --git a/src/WimaView/WimaToolBar.qml b/src/WimaView/WimaToolBar.qml
index bb45e88dec04ae04eabfdcd03c088806f0be8f15..18ebb9405b5f4ed24bbbcd382f0673553badd985 100644
--- a/src/WimaView/WimaToolBar.qml
+++ b/src/WimaView/WimaToolBar.qml
@@ -323,7 +323,7 @@ Rectangle {
                 Layout.columnSpan: 2
             }
 
-            QGCCheckBox {
+           QGCCheckBox {
                 property var nemo: wimaPlaner ? wimaPlaner.nemoInterface : undefined
 
                 text:               qsTr("Lock Progress")
@@ -336,12 +336,10 @@ Rectangle {
                         } else {
                             wimaPlaner.progressLocked = false
                         }
-                        checked = Qt.binding(function(){return wimaPlaner.progressLocked})
                     }
                 }
                 Layout.minimumWidth:    _mediumValueWidth
             }
-
         }
     }