diff --git a/src/ui/map3D/Imagery.cc b/src/ui/map3D/Imagery.cc
index a2dbb42..8c2f9f3 100644
--- a/src/ui/map3D/Imagery.cc
+++ b/src/ui/map3D/Imagery.cc
@@ -298,12 +298,12 @@ Imagery::tileBounds(double tileResolution,
     {
         double utmMultiplier = tileResolution * 200;
 
-        minTileX = static_cast<int32_t>(floor(minUtmX / utmMultiplier));
-        minTileY = static_cast<int32_t>(floor(minUtmY / utmMultiplier));
-        centerTileX = static_cast<int32_t>(floor(centerUtmX / utmMultiplier));
-        centerTileY = static_cast<int32_t>(floor(centerUtmY / utmMultiplier));
-        maxTileX = static_cast<int32_t>(floor(maxUtmX / utmMultiplier));
-        maxTileY = static_cast<int32_t>(floor(maxUtmY / utmMultiplier));
+        minTileX = static_cast<int32_t>(rint(minUtmX / utmMultiplier));
+        minTileY = static_cast<int32_t>(rint(minUtmY / utmMultiplier));
+        centerTileX = static_cast<int32_t>(rint(centerUtmX / utmMultiplier));
+        centerTileY = static_cast<int32_t>(rint(centerUtmY / utmMultiplier));
+        maxTileX = static_cast<int32_t>(rint(maxUtmX / utmMultiplier));
+        maxTileY = static_cast<int32_t>(rint(maxUtmY / utmMultiplier));
     }
 
     if (maxTileX - minTileX + 1 > 14)
@@ -571,7 +571,7 @@ Imagery::getTileLocation(int32_t tileX, int32_t tileY, int32_t zoomLevel,
             << "&y=" << tileY << "&z=" << zoomLevel;
         break;
     case SWISSTOPO_SATELLITE:
-        oss << "../map/eth_zurich_swissimage_025/200/color/" << tileX
+        oss << "../map/eth_zurich_swissimage_025/200/color/" << tileY
             << "/tile-";
         if (tileResolution < 1.0)
         {
@@ -581,7 +581,7 @@ Imagery::getTileLocation(int32_t tileX, int32_t tileY, int32_t zoomLevel,
         {
             oss << static_cast<int32_t>(rint(tileResolution));
         }
-        oss << "-" << tileX << "-" << tileY << ".jpg";
+        oss << "-" << tileY << "-" << tileX << ".jpg";
     default:
         {};
     }
diff --git a/src/ui/map3D/Q3DWidget.cc b/src/ui/map3D/Q3DWidget.cc
index c3a7370..be4f0dd 100755
--- a/src/ui/map3D/Q3DWidget.cc
+++ b/src/ui/map3D/Q3DWidget.cc
@@ -232,7 +232,7 @@ Q3DWidget::userTimer(void)
 {
     if (timerFunc)
     {
-            timerFunc(timerFuncData);
+        timerFunc(timerFuncData);
     }
 }
 
@@ -356,7 +356,6 @@ Q3DWidget::getMouseY(void)
     return mapFromGlobal(cursor().pos()).y();
 }
 
-
 void
 Q3DWidget::rotateCamera(float dx, float dy)
 {
@@ -858,9 +857,12 @@ Q3DWidget::timerEvent(QTimerEvent* event)
 }
 
 void
-Q3DWidget::closeEvent(QCloseEvent *)
+Q3DWidget::closeEvent(QCloseEvent* event)
 {
     // exit application
+    timer.stop();
+
+    event->accept();
 }
 
 void
diff --git a/src/ui/map3D/WebImage.cc b/src/ui/map3D/WebImage.cc
index df11673..a5c1e88 100644
--- a/src/ui/map3D/WebImage.cc
+++ b/src/ui/map3D/WebImage.cc
@@ -31,7 +31,6 @@ This file is part of the QGROUNDCONTROL project
 
 #include "WebImage.h"
 
-#include <QDebug>
 #include <QGLWidget>
 
 WebImage::WebImage()
@@ -99,8 +98,6 @@ WebImage::setData(const QByteArray& data)
     }
     else
     {
-        qDebug() << "# WARNING: cannot load image data for" << sourceURL;
-
         return false;
     }
 }
@@ -121,8 +118,6 @@ WebImage::setData(const QString& filename)
     }
     else
     {
-        qDebug() << "# WARNING: cannot load image data for" << filename;
-
         return false;
     }
 }