diff --git a/AUTHORS b/AUTHORS
index c8210703c0e7d89cbd666662c013c1612aabc458..dd48e35f6857608397439d9fa8a7fa8c021918f0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,2 @@
-Tomas Mecir <kmuddy@kmuddy.com>
+Tomas Mecir <mecirt@gmail.com>
 
diff --git a/configure b/configure
index b74f1049f53117ae5093bd947c6012a00de9b015..d8bd60e55e0fca38478e61f2798041b41c42c5e5 100755
--- a/configure
+++ b/configure
@@ -3,5 +3,5 @@ SRCDIR=$(pwd)
 
 mkdir ../kmuddy-build
 cd ../kmuddy-build
-cmake ${SRCDIR} -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix`
+cmake ${SRCDIR} -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=`kf5-config --prefix`
 
diff --git a/configure-debug b/configure-debug
index 1cac93ad51438c9c485906da47954a71111798b7..d6725c9d183e74adef6bec5ad20a1d4a0a898022 100755
--- a/configure-debug
+++ b/configure-debug
@@ -3,5 +3,5 @@ SRCDIR=$(pwd)
 
 mkdir ../kmuddy-build
 cd ../kmuddy-build
-cmake ${SRCDIR} -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix`
+cmake ${SRCDIR} -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=`kf5-config --prefix`
 
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index 052f6b417fa3319a264c0910bd2f317bc32a3477..1d270705fd2b33927560be5837cffe89c8327394 100644
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -58,7 +58,7 @@ add_library(kmuddycore SHARED ${kmuddycore_LIB_SRCS})
 # TODO: get rid of the support libs
 target_link_libraries(kmuddycore KF5::KCMUtils KF5::I18n KF5::Service KF5::KDELibs4Support Qt5::Script Qt5::Multimedia)
 
-set_target_properties(kmuddycore PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+set_target_properties(kmuddycore PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 install(TARGETS kmuddycore DESTINATION ${LIB_INSTALL_DIR} )
 
 
diff --git a/plugins/mapper/cmapviewstatusbar.cpp b/plugins/mapper/cmapviewstatusbar.cpp
index bf1cb5a14b5576940a5993daa13480c6af5d6ec3..e53215b3736b8ec0c6cef5c7ba7a849f58e63fdd 100644
--- a/plugins/mapper/cmapviewstatusbar.cpp
+++ b/plugins/mapper/cmapviewstatusbar.cpp
@@ -104,9 +104,7 @@ void CMapViewStatusbar::setZone(CMapZone *zone)
     d->zonePicker->setCurrentIndex(zones->activeZone());
   }
 
-  if (d->zone == zone) return;
   d->zone = zone;
-
   d->levelPicker->setModel(zone->levelsModel());
   setLevel(d->manager->getActiveView()->getCurrentlyViewedLevel());
 }
diff --git a/plugins/mapper/filefilters/cmapfilefilterxml.cpp b/plugins/mapper/filefilters/cmapfilefilterxml.cpp
index 39f6bfebe1cb8accb2f57e2aa0fa1ddb60de81f6..8f8f6268c4f9c8628f9aef8d2a776ea9c3feeb97 100644
--- a/plugins/mapper/filefilters/cmapfilefilterxml.cpp
+++ b/plugins/mapper/filefilters/cmapfilefilterxml.cpp
@@ -639,7 +639,7 @@ void CMapFileFilterXML::savePluginPropertiesForElement(CMapElement *element,QDom
     plugin->saveElementProperties(element,&pluginProperties);
 
     EntryMap entries = pluginProperties.entryMap("Properties");
-    for (EntryMap::ConstIterator it = entries.begin(); it != entries.end(); ++it)
+    for (EntryMap::ConstIterator it = entries.constBegin(); it != entries.constEnd(); ++it)
     {
       pNode.setAttribute(it.key(),it.value());
     }