diff --git a/src/QtLocationPlugin/QGCMapEngine.cpp b/src/QtLocationPlugin/QGCMapEngine.cpp
index 5e4a9966d31d4fe288e6ecbe42c1707df3388f66..d093f3b2c167f4f1fdb96c3dae1cefa0862adbaa 100644
--- a/src/QtLocationPlugin/QGCMapEngine.cpp
+++ b/src/QtLocationPlugin/QGCMapEngine.cpp
@@ -33,6 +33,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QSettings>
 #include <QStandardPaths>
 #include <QDir>
+#include <stdio.h>
 
 #include "QGCMapEngine.h"
 #include "QGCMapTileSet.h"
@@ -208,9 +209,7 @@ QGCMapEngine::cacheTile(UrlFactory::MapType type, const QString& hash, const QBy
 QString
 QGCMapEngine::getTileHash(UrlFactory::MapType type, int x, int y, int z)
 {
-    char hashSource[64];
-    snprintf(hashSource, sizeof(hashSource), "%04d%08d%08d%03d", (int)type, x, y, z);
-    return QString(hashSource);
+    return QString().sprintf("%04d%08d%08d%03d", (int)type, x, y, z);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
index 46160610f3d1eb69494d18062836f60f53b86628..c762f84235b39a7a580fbd6dab13683f34a9d12a 100644
--- a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
+++ b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
@@ -226,9 +226,13 @@ QGeoTiledMappingManagerEngineQGC::_setCache(const QVariantMap &parameters)
     QGeoTileCache* pTileCache = createTileCacheWithDir(cacheDir);
     if(pTileCache)
     {
-        //-- We're basically telling it to use 1kb of disk for cache. It doesn't like
+        //-- We're basically telling it to use 1kb (100k for Windows) of disk for cache. It doesn't like
         //   values smaller than that and I could not find a way to make it NOT cache.
+#ifdef Q_OS_WIN
+        pTileCache->setMaxDiskUsage(1024 * 100);
+#else
         pTileCache->setMaxDiskUsage(1024);
+#endif
         pTileCache->setMaxMemoryUsage(memLimit);
     }
 }
diff --git a/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc b/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
index e1f4f55a206e31b56119f03caa820237c8d1fcdd..e506dcb42eb3ddeaef669014e79d9ce7f1e2662f 100644
--- a/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
+++ b/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
@@ -30,6 +30,7 @@
 #include "QGCMapTileSet.h"
 #include "QGCMapUrlEngine.h"
 #include <QStorageInfo>
+#include <stdio.h>
 
 QGC_LOGGING_CATEGORY(QGCMapEngineManagerLog, "QGCMapEngineManagerLog")
 
@@ -378,10 +379,8 @@ QGCMapEngineManager::getUniqueName()
     QString name;
     int count = 1;
     while (true) {
-        char numb[16];
-        snprintf(numb, sizeof(numb), "%03d", count++);
         name = test;
-        name += numb;
+        name += QString().sprintf("%03d", count++);
         if(!findName(name))
             return name;
     }