diff --git a/ground/src/libs/opmapcontrol/src/internals/core.cpp b/ground/src/libs/opmapcontrol/src/internals/core.cpp
index c7b31be7a..9a19274ed 100644
--- a/ground/src/libs/opmapcontrol/src/internals/core.cpp
+++ b/ground/src/libs/opmapcontrol/src/internals/core.cpp
@@ -148,7 +148,7 @@ namespace internals {
                                         QWaitCondition wait;
                                         QMutex m;
                                         m.lock();
-                                        wait.wait(&m,1111);
+                                        wait.wait(&m,500);
                                     }
                                 }
                             }
@@ -171,6 +171,7 @@ namespace internals {
 
                             delete t;
                             t = 0;
+                            emit OnNeedInvalidation();
                         }
 
                         // layers = null;
diff --git a/ground/src/libs/opmapcontrol/src/internals/core.h b/ground/src/libs/opmapcontrol/src/internals/core.h
index 39d0f5f23..5a1bbf604 100644
--- a/ground/src/libs/opmapcontrol/src/internals/core.h
+++ b/ground/src/libs/opmapcontrol/src/internals/core.h
@@ -189,7 +189,7 @@ public:
 
 
 signals:
-    void OnCurrentPositionChanged(PointLatLng point);
+    void OnCurrentPositionChanged(internals::PointLatLng point);
     void OnTileLoadComplete();
     void OnTilesStillToLoad(int number);
     void OnTileLoadStart();
diff --git a/ground/src/libs/opmapcontrol/src/internals/projections/mercatorprojectionyandex.cpp b/ground/src/libs/opmapcontrol/src/internals/projections/mercatorprojectionyandex.cpp
index 8cceda849..b97211f86 100644
--- a/ground/src/libs/opmapcontrol/src/internals/projections/mercatorprojectionyandex.cpp
+++ b/ground/src/libs/opmapcontrol/src/internals/projections/mercatorprojectionyandex.cpp
@@ -62,8 +62,8 @@ internals::PointLatLng MercatorProjectionYandex::FromPixelToLatLng(const int &x,
 {
     Size s = GetTileMatrixSizePixel(zoom);
 
-    double mapSizeX = s.Width();
-    double mapSizeY = s.Height();
+    //double mapSizeX = s.Width();
+    //double mapSizeY = s.Height();
 
     double a = 6378137;
     double c1 = 0.00335655146887969;
diff --git a/ground/src/libs/opmapcontrol/src/internals/projections/platecarreeprojection.cpp b/ground/src/libs/opmapcontrol/src/internals/projections/platecarreeprojection.cpp
index 894e924c6..10b75539a 100644
--- a/ground/src/libs/opmapcontrol/src/internals/projections/platecarreeprojection.cpp
+++ b/ground/src/libs/opmapcontrol/src/internals/projections/platecarreeprojection.cpp
@@ -43,7 +43,7 @@ Point PlateCarreeProjection::FromLatLngToPixel(double lat, double lng, const int
 
     Size s = GetTileMatrixSizePixel(zoom);
     double mapSizeX = s.Width();
-    double mapSizeY = s.Height();
+    //double mapSizeY = s.Height();
 
     double scale = 360.0 / mapSizeX;
 
@@ -59,7 +59,7 @@ internals::PointLatLng PlateCarreeProjection::FromPixelToLatLng(const int &x, co
 
     Size s = GetTileMatrixSizePixel(zoom);
     double mapSizeX = s.Width();
-    double mapSizeY = s.Height();
+    //double mapSizeY = s.Height();
 
     double scale = 360.0 / mapSizeX;
 
diff --git a/ground/src/libs/opmapcontrol/src/internals/projections/platecarreeprojectionpergo.cpp b/ground/src/libs/opmapcontrol/src/internals/projections/platecarreeprojectionpergo.cpp
index 9c3a3065e..20da11e3a 100644
--- a/ground/src/libs/opmapcontrol/src/internals/projections/platecarreeprojectionpergo.cpp
+++ b/ground/src/libs/opmapcontrol/src/internals/projections/platecarreeprojectionpergo.cpp
@@ -42,7 +42,7 @@ Point PlateCarreeProjectionPergo::FromLatLngToPixel(double lat, double lng, cons
 
     Size s = GetTileMatrixSizePixel(zoom);
     double mapSizeX = s.Width();
-    double mapSizeY = s.Height();
+    //double mapSizeY = s.Height();
 
     double scale = 360.0 / mapSizeX;
 
@@ -57,7 +57,7 @@ internals::PointLatLng PlateCarreeProjectionPergo::FromPixelToLatLng(const int &
 
     Size s = GetTileMatrixSizePixel(zoom);
     double mapSizeX = s.Width();
-    double mapSizeY = s.Height();
+    //double mapSizeY = s.Height();
 
     double scale = 360.0 / mapSizeX;