diff --git a/modules/globebrowsing/cache/memoryawaretilecache.cpp b/modules/globebrowsing/cache/memoryawaretilecache.cpp
index 3dd31eef5d..674607203a 100644
--- a/modules/globebrowsing/cache/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/cache/memoryawaretilecache.cpp
@@ -294,8 +294,8 @@ void MemoryAwareTileCache::update() {
 
     const size_t ByteToMegaByte = 1024 * 1024;
 
-    _cpuAllocatedTileData.setValue(dataSizeCPU / ByteToMegaByte);
-    _gpuAllocatedTileData.setValue(dataSizeGPU / ByteToMegaByte);
+    _cpuAllocatedTileData.setValue(static_cast<int>(dataSizeCPU / ByteToMegaByte));
+    _gpuAllocatedTileData.setValue(static_cast<int>(dataSizeGPU / ByteToMegaByte));
 }
 
 size_t MemoryAwareTileCache::getGPUAllocatedDataSize() const {
diff --git a/modules/globebrowsing/chunk/culling/frustumculler.cpp b/modules/globebrowsing/chunk/culling/frustumculler.cpp
index 573f94da24..d576ae4241 100644
--- a/modules/globebrowsing/chunk/culling/frustumculler.cpp
+++ b/modules/globebrowsing/chunk/culling/frustumculler.cpp
@@ -50,7 +50,7 @@ bool FrustumCuller::isCullable(const Chunk& chunk, const RenderData& data) {
         glm::dvec4 cornerClippingSpace = modelViewProjectionTransform * corners[i];
         clippingSpaceCorners[i] = cornerClippingSpace;
 
-        glm::dvec3 ndc = (1.0f / glm::abs(cornerClippingSpace.w)) * cornerClippingSpace;
+        glm::dvec3 ndc = glm::dvec3((1.0f / glm::abs(cornerClippingSpace.w)) * cornerClippingSpace);
         bounds.expand(ndc);
     }
         
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index bdd716d3d0..97d2878707 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -348,7 +348,7 @@ void GlobeBrowsingModule::goToGeodetic2(Camera& camera,
     glm::dmat4 inverseModelTransform =
         OsEng.navigationHandler().focusNode()->inverseModelTransform();
     glm::dvec3 cameraPositionModelSpace =
-        inverseModelTransform * glm::dvec4(cameraPosition, 1.0);
+        glm::dvec3(inverseModelTransform * glm::dvec4(cameraPosition, 1.0));
     SurfacePositionHandle posHandle = globe->calculateSurfacePositionHandle(
                                                                 cameraPositionModelSpace);
     
@@ -372,7 +372,7 @@ void GlobeBrowsingModule::goToGeodetic3(Camera& camera, globebrowsing::Geodetic3
 
     glm::dvec3 positionModelSpace = globe->ellipsoid().cartesianPosition(geo3);
     glm::dmat4 modelTransform = globe->modelTransform();
-    glm::dvec3 positionWorldSpace = modelTransform * glm::dvec4(positionModelSpace, 1.0);
+    glm::dvec3 positionWorldSpace = glm::dvec3(modelTransform * glm::dvec4(positionModelSpace, 1.0));
     camera.setPositionVec3(positionWorldSpace);
 
     if (resetCameraDirection) {
@@ -401,7 +401,7 @@ void GlobeBrowsingModule::resetCameraDirection(Camera& camera, globebrowsing::Ge
     glm::dvec3 lookUpWorldSpace = glm::dmat3(modelTransform) * lookUpModelSpace;
     
     // Lookat vector
-    glm::dvec3 lookAtWorldSpace = modelTransform * glm::dvec4(positionModelSpace, 1.0);
+    glm::dvec3 lookAtWorldSpace = glm::dvec3(modelTransform * glm::dvec4(positionModelSpace, 1.0));
 
     // Eye position
     glm::dvec3 eye = camera.positionVec3();
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 6ed1fe8472..b69b8ef8c6 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -190,7 +190,7 @@ int getGeoPosition(lua_State* L) {
     glm::dmat4 inverseModelTransform =
         OsEng.navigationHandler().focusNode()->inverseModelTransform();
     glm::dvec3 cameraPositionModelSpace =
-        inverseModelTransform * glm::dvec4(cameraPosition, 1.0);
+        glm::dvec3(inverseModelTransform * glm::dvec4(cameraPosition, 1.0));
     SurfacePositionHandle posHandle = globe->calculateSurfacePositionHandle(
         cameraPositionModelSpace);
 
@@ -248,7 +248,7 @@ int capabilities(lua_State* L) {
         OsEng.moduleEngine().module<GlobeBrowsingModule>()->capabilities(name);
 
     lua_newtable(L);
-    for (int i = 0; i < cap.size(); ++i) {
+    for (unsigned long i = 0; i < cap.size(); ++i) {
         const GlobeBrowsingModule::Layer& l = cap[i];
         
         lua_newtable(L);
diff --git a/modules/globebrowsing/globes/chunkedlodglobe.cpp b/modules/globebrowsing/globes/chunkedlodglobe.cpp
index eaf7245bf0..58fc8dfe98 100644
--- a/modules/globebrowsing/globes/chunkedlodglobe.cpp
+++ b/modules/globebrowsing/globes/chunkedlodglobe.cpp
@@ -334,7 +334,7 @@ void ChunkedLodGlobe::debugRenderChunk(const Chunk& chunk, const glm::dmat4& mvp
             clippingSpaceCorners[i] = clippingSpaceCorner;
 
             glm::vec3 screenSpaceCorner =
-                (1.0f / clippingSpaceCorner.w) * clippingSpaceCorner;
+                glm::vec3((1.0f / clippingSpaceCorner.w) * clippingSpaceCorner);
             screenSpaceBounds.expand(screenSpaceCorner);
         }
 
diff --git a/modules/globebrowsing/rendering/chunkrenderer.cpp b/modules/globebrowsing/rendering/chunkrenderer.cpp
index b2c50c29c6..522e6795b5 100644
--- a/modules/globebrowsing/rendering/chunkrenderer.cpp
+++ b/modules/globebrowsing/rendering/chunkrenderer.cpp
@@ -131,7 +131,7 @@ void ChunkRenderer::setCommonUniforms(ghoul::opengl::ProgramObject& programObjec
         glm::vec3 directionToSunWorldSpace =
             glm::normalize(-data.modelTransform.translation);
         glm::vec3 directionToSunCameraSpace =
-            (viewTransform * glm::dvec4(directionToSunWorldSpace, 0));
+            glm::vec3(viewTransform * glm::dvec4(directionToSunWorldSpace, 0));
         programObject.setUniform(
             "lightDirectionCameraSpace", -directionToSunCameraSpace);
     }
diff --git a/modules/globebrowsing/rendering/layer/layer.cpp b/modules/globebrowsing/rendering/layer/layer.cpp
index 20366a1954..1edc55dcf6 100644
--- a/modules/globebrowsing/rendering/layer/layer.cpp
+++ b/modules/globebrowsing/rendering/layer/layer.cpp
@@ -101,7 +101,7 @@ Layer::Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict,
     , _remove(RemoveInfo)
     , _tileProvider(nullptr)
     , _otherTypesProperties({
-        { ColorInfo, glm::vec4(1.f), glm::vec4(0.f), glm::vec4(1.f) }
+        { ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f) }
     })
     , _layerGroupId(id)
 {
@@ -367,7 +367,6 @@ void Layer::initializeBasedOnType(layergroupid::TypeID typeId, ghoul::Dictionary
         }
         default:
             throw ghoul::RuntimeError("Unable to create layer. Unknown type.");
-            break;
     }
 }
 
@@ -380,13 +379,16 @@ void Layer::addVisibleProperties() {
         case layergroupid::TypeID::TemporalTileLayer:
         case layergroupid::TypeID::TileIndexTileLayer:
         case layergroupid::TypeID::ByIndexTileLayer:
-        case layergroupid::TypeID::ByLevelTileLayer:
+        case layergroupid::TypeID::ByLevelTileLayer: {
             if (_tileProvider) {
                 addPropertySubOwner(*_tileProvider);
             }
             break;
-        case layergroupid::TypeID::SolidColor:
+        }
+        case layergroupid::TypeID::SolidColor: {
             addProperty(_otherTypesProperties.color);
+            break;
+        }
         default:
             break;
     }
diff --git a/modules/globebrowsing/rendering/layer/layermanager.cpp b/modules/globebrowsing/rendering/layer/layermanager.cpp
index 7efa897c47..7e012c501c 100644
--- a/modules/globebrowsing/rendering/layer/layermanager.cpp
+++ b/modules/globebrowsing/rendering/layer/layermanager.cpp
@@ -39,7 +39,7 @@ LayerManager::LayerManager(const ghoul::Dictionary& layerGroupsDict)
 {
     // First create empty layer groups in case not all are specified
     _layerGroups.resize(layergroupid::NUM_LAYER_GROUPS);
-    for (int i = 0; i < _layerGroups.size(); ++i) {
+    for (unsigned long i = 0; i < _layerGroups.size(); ++i) {
         ghoul::Dictionary emptyDict;
         _layerGroups[i] = std::make_shared<LayerGroup>(
             static_cast<layergroupid::GroupID>(i), emptyDict
@@ -49,8 +49,7 @@ LayerManager::LayerManager(const ghoul::Dictionary& layerGroupsDict)
     std::vector<std::string> layerGroupNamesInDict = layerGroupsDict.keys();
 
     // Create all the layer groups
-    for (const std::string groupName : layerGroupNamesInDict) {
-
+    for (const std::string& groupName : layerGroupNamesInDict) {
         layergroupid::GroupID groupId = layergroupid::getGroupIDFromName(groupName);
         
         if (groupId != layergroupid::GroupID::Unknown) {
diff --git a/modules/globebrowsing/rendering/layer/layerrendersettings.cpp b/modules/globebrowsing/rendering/layer/layerrendersettings.cpp
index 62bb2e5ca1..1607d278cb 100644
--- a/modules/globebrowsing/rendering/layer/layerrendersettings.cpp
+++ b/modules/globebrowsing/rendering/layer/layerrendersettings.cpp
@@ -29,7 +29,6 @@ namespace {
     const char* keyGamma = "Gamma";
     const char* keyMultiplier = "Multiplier";
     const char* keyOffset = "Offset";
-    const char* keyValueBlending = "ValueBlending";
 
     static const openspace::properties::Property::PropertyInfo SetDefaultInfo = {
         "SetDefault",
diff --git a/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.cpp b/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.cpp
index b0e607bb6f..124ac7dba1 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.cpp
+++ b/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.cpp
@@ -45,10 +45,6 @@
 
 #include <algorithm>
 
-namespace {
-    const char* _loggerCat = "GdalRawTileDataReader";
-}
-
 namespace openspace::globebrowsing {
 
 std::ostream& operator<<(std::ostream& os, const PixelRegion& pr) {
@@ -191,9 +187,9 @@ RawTile::ReadError GdalRawTileDataReader::rasterRead(
         dataDest,                       // Where to put data
         io.write.region.numPixels.x,    // width to write x in destination
         io.write.region.numPixels.y,    // width to write y in destination
-        _gdalDatasetMetaDataCached.dataType,                      // Type
-        _initData.bytesPerPixel(),      // Pixel spacing
-        -io.write.bytesPerLine          // Line spacing
+        _gdalDatasetMetaDataCached.dataType,         // Type
+        static_cast<int>(_initData.bytesPerPixel()), // Pixel spacing
+        static_cast<int>(-io.write.bytesPerLine)     // Line spacing
     );
   
     // Convert error to RawTile::ReadError
diff --git a/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.h b/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.h
index 34e81e8e09..6d4e6df8dc 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.h
+++ b/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.h
@@ -77,7 +77,7 @@ public:
     virtual float noDataValueAsFloat() const override;
     virtual int rasterXSize() const override;
     virtual int rasterYSize() const override;
-    virtual int dataSourceNumRasters() const;
+    virtual int dataSourceNumRasters() const override;
     virtual float depthOffset() const override;
     virtual float depthScale() const override;
 
diff --git a/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp b/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp
index a4bd99204f..d5f934682c 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp
+++ b/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp
@@ -65,7 +65,7 @@ namespace {
 
 namespace openspace::globebrowsing {
 
-void gdalErrorHandler(CPLErr eErrClass, int errNo, const char *msg) {
+void gdalErrorHandler(CPLErr eErrClass, int, const char *msg) {
     if (GdalWrapper::ref().logGdalErrors()) {
         switch (eErrClass) {
             case CE_None: break;
@@ -113,9 +113,9 @@ GdalWrapper::GdalWrapper(size_t maximumCacheSize, size_t maximumMaximumCacheSize
     , _logGdalErrors(LogGdalErrorInfo, true)
     , _gdalMaximumCacheSize (
         GdalMaximumCacheInfo,
-        maximumCacheSize / (1024 * 1024),           // Default
+        static_cast<int>(maximumCacheSize / (1024ULL * 1024ULL)), // Default
         0,                                          // Minimum: No caching
-        maximumMaximumCacheSize / (1024 * 1024),    // Maximum
+        static_cast<int>(maximumMaximumCacheSize / (1024ULL * 1024ULL)), // Maximum
         1                                           // Step: One MB
     ) {
     addProperty(_logGdalErrors);
diff --git a/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.cpp b/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.cpp
index 134f2d441d..447e216d5e 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.cpp
+++ b/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.cpp
@@ -50,7 +50,6 @@
 #include <unordered_map>
 #include <limits>
 
-#define _USE_MATH_DEFINES
 #include <math.h>
 
 namespace openspace::globebrowsing {
@@ -59,7 +58,6 @@ RawTileDataReader::RawTileDataReader(const TileTextureInitData& initData,
                                      PerformPreprocessing preprocess)
     : _initData(initData)
     , _preprocess(preprocess)
-    , _hasBeenInitialized(false)
 { }
 
 std::shared_ptr<RawTile> RawTileDataReader::defaultTileData() const {
diff --git a/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.h b/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.h
index b99ed886bc..8f33cd9083 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.h
+++ b/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.h
@@ -165,9 +165,6 @@ protected:
     const TileTextureInitData _initData;
     PerformPreprocessing _preprocess;
     TileDepthTransform _depthTransform;
-
-private:
-    bool _hasBeenInitialized;    
 };
 
 } // namespace openspace::globebrowsing
diff --git a/modules/globebrowsing/tile/rawtiledatareader/simplerawtiledatareader.cpp b/modules/globebrowsing/tile/rawtiledatareader/simplerawtiledatareader.cpp
index 84acea65bc..e575bf2504 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/simplerawtiledatareader.cpp
+++ b/modules/globebrowsing/tile/rawtiledatareader/simplerawtiledatareader.cpp
@@ -37,10 +37,6 @@
 
 #include <ghoul/io/texture/texturereader.h>
 
-namespace {
-    const char* _loggerCat = "SimpleRawTileDataReader";
-} // namespace
-
 namespace openspace::globebrowsing {
 
 SimpleRawTileDataReader::SimpleRawTileDataReader(const std::string& filePath,
diff --git a/modules/globebrowsing/tile/rawtiledatareader/simplerawtiledatareader.h b/modules/globebrowsing/tile/rawtiledatareader/simplerawtiledatareader.h
index 2d12218595..ebb04fbea1 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/simplerawtiledatareader.h
+++ b/modules/globebrowsing/tile/rawtiledatareader/simplerawtiledatareader.h
@@ -57,12 +57,12 @@ public:
     virtual float noDataValueAsFloat() const override;
     virtual int rasterXSize() const override;
     virtual int rasterYSize() const override;
-    virtual int dataSourceNumRasters() const;
+    virtual int dataSourceNumRasters() const override;
     virtual float depthOffset() const override;
     virtual float depthScale() const override;
 
 protected:
-    virtual IODescription adjustIODescription(const IODescription& io) const;
+    virtual IODescription adjustIODescription(const IODescription& io) const override;
 
 private:
     // Private virtual function overloading
diff --git a/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp b/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
index 0d4a60c8a0..9c3da72259 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
+++ b/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
@@ -67,6 +67,7 @@ float interpretFloat(GDALDataType gdalType, const char* src) {
         default:
             ghoul_assert(false, "Unknown data type");
         }
+    return 0.0f;
 }
 
 size_t numberOfBytes(GDALDataType gdalType) {
@@ -88,23 +89,25 @@ size_t numberOfBytes(GDALDataType gdalType) {
         default:
             ghoul_assert(false, "Unknown data type");
     }
+    return 0ULL;
 }
 
 size_t getMaximumValue(GDALDataType gdalType) {
     switch (gdalType) {
         case GDT_Byte:
-            return 1 << 8;
+            return 1ULL << 8ULL;
         case GDT_UInt16:
-            return 1 << 16;
+            return 1ULL << 16ULL;
         case GDT_Int16:
-            return 1 << 15;
+            return 1ULL << 15ULL;
         case GDT_UInt32:
-            return size_t(1) << 32;
+            return size_t(1) << 32ULL;
         case GDT_Int32:
-            return 1 << 31;
+            return 1ULL << 31ULL;
         default:
             ghoul_assert(false, "Unknown data type");
     }
+    return 0ULL;
 }
 
 TextureFormat getTextureFormat(int rasterCount, GDALDataType gdalType) {
@@ -409,10 +412,10 @@ size_t numberOfRasters(ghoul::opengl::Texture::Format format) {
     switch (format) {
         case ghoul::opengl::Texture::Format::Red: return 1;
         case ghoul::opengl::Texture::Format::RG: return 2;
-        case ghoul::opengl::Texture::Format::RGB:; // Intentional fallthrough
-        case ghoul::opengl::Texture::Format::BGR: return 3;
-        case ghoul::opengl::Texture::Format::RGBA:; // Intentional fallthrough
-        case ghoul::opengl::Texture::Format::BGRA: return 4;
+        case ghoul::opengl::Texture::Format::RGB:;
+        [[fallthrough]]; case ghoul::opengl::Texture::Format::BGR: return 3;
+        case ghoul::opengl::Texture::Format::RGBA:;
+        [[fallthrough]]; case ghoul::opengl::Texture::Format::BGRA: return 4;
         default: {
             ghoul_assert(false, "Unknown format");
             return 0;
@@ -441,18 +444,18 @@ size_t numberOfBytes(GLenum glType) {
 size_t getMaximumValue(GLenum glType) {
     switch (glType) {
         case GL_UNSIGNED_BYTE:
-            return 1 << 8;
+            return 1ULL << 8ULL;
         case GL_UNSIGNED_SHORT:
-            return 1 << 16;
+            return 1ULL << 16ULL;
         case GL_SHORT:
-            return 1 << 15;
+            return 1ULL << 15ULL;
         case GL_UNSIGNED_INT:
-            return size_t(1) << 32;
+            return 1ULL << 32ULL;
         case GL_INT:
-            return 1 << 31;
+            return 1ULL << 31ULL;
         default: {
             ghoul_assert(false, "Unknown data type");
-            return 0;
+            return 0ULL;
         }
     }
 }
diff --git a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
index fa9a609bdd..59f84a42b9 100644
--- a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
+++ b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
@@ -431,12 +431,20 @@ double TimeQuantizer::parseTimeResolutionStr(const std::string& resoltutionStr)
         // convert value to seconds, based on unit.
         // The switch statment has intentional fall throughs
         switch (unit) {
-        case 'y': value *= 365;
-        case 'd': value *= 24.0;
-        case 'h': value *= 60.0;
-        case 'm': value *= 60.0;
-        case 's': value *= 1.0;
-            break;
+            case 'y':
+                value *= 365;
+                [[fallthrough]];
+            case 'd':
+                value *= 24.0;
+                [[fallthrough]];
+            case 'h': value *= 60.0;
+                [[fallthrough]];
+            case 'm':
+                value *= 60.0;
+                [[fallthrough]];
+            case 's':
+                value *= 1.0;
+                break;
         default:
             throw ghoul::RuntimeError("Invalid unit format '" + std::string(1, unit) +
                 "'. Expected 'y', 'd', 'h', 'm' or 's'.");
diff --git a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.h b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.h
index 49b372db6c..d770890706 100644
--- a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.h
+++ b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.h
@@ -317,13 +317,13 @@ private:
   
     bool readFilePath();
 
+    // Used for creation of time specific instances of CachingTileProvider
+    ghoul::Dictionary _initDict;
     properties::StringProperty _filePath;
     std::string _gdalXmlTemplate;
 
     std::unordered_map<TimeKey, std::shared_ptr<TileProvider>> _tileProviderMap;
 
-    // Used for creation of time specific instances of CachingTileProvider
-    ghoul::Dictionary _initDict;
 
     std::shared_ptr<TileProvider> _currentTileProvider;
         
diff --git a/modules/globebrowsing/tile/tileprovider/texttileprovider.cpp b/modules/globebrowsing/tile/tileprovider/texttileprovider.cpp
index 5b4abbac7f..bcff0097b3 100644
--- a/modules/globebrowsing/tile/tileprovider/texttileprovider.cpp
+++ b/modules/globebrowsing/tile/tileprovider/texttileprovider.cpp
@@ -50,7 +50,7 @@ TextTileProvider::TextTileProvider(const TileTextureInitData& initData, size_t f
     _font = OsEng.fontManager().font("Mono", static_cast<float>(_fontSize));
         
     _fontRenderer = std::unique_ptr<FontRenderer>(FontRenderer::createDefault());
-    _fontRenderer->setFramebufferSize(_initData.dimensions());
+    _fontRenderer->setFramebufferSize(glm::vec2(_initData.dimensions()));
     
     glGenFramebuffers(1, &_fbo);
 }
diff --git a/modules/globebrowsing/tile/tileprovider/tileprovider.cpp b/modules/globebrowsing/tile/tileprovider/tileprovider.cpp
index ebc7ddb3b5..7e02d09a7f 100644
--- a/modules/globebrowsing/tile/tileprovider/tileprovider.cpp
+++ b/modules/globebrowsing/tile/tileprovider/tileprovider.cpp
@@ -164,7 +164,7 @@ void TileProvider::initializeDefaultTile() {
     TileTextureInitData initData(8, 8, GL_UNSIGNED_BYTE, Texture::Format::RGBA,
                                  false,
         TileTextureInitData::ShouldAllocateDataOnCPU::Yes);
-    int numBytes = initData.totalNumBytes();
+    size_t numBytes = initData.totalNumBytes();
     char* pixels = new char[numBytes];
     memset(pixels, 0, numBytes);
 
diff --git a/modules/globebrowsing/tile/tileprovider/tileproviderbyindex.cpp b/modules/globebrowsing/tile/tileprovider/tileproviderbyindex.cpp
index c002055174..14e5597eba 100644
--- a/modules/globebrowsing/tile/tileprovider/tileproviderbyindex.cpp
+++ b/modules/globebrowsing/tile/tileprovider/tileproviderbyindex.cpp
@@ -27,8 +27,6 @@
 #include <ghoul/misc/dictionary.h>
 
 namespace {
-    const char* _loggerCat = "TileProviderByIndex";
-    
     const char* KeyDefaultProvider = "DefaultProvider";
     const char* KeyProviders = "IndexTileProviders";
     const char* KeyTileIndex = "TileIndex";
diff --git a/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.cpp b/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.cpp
index 7666f95823..f6a0c06a24 100644
--- a/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.cpp
+++ b/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.cpp
@@ -100,11 +100,11 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
         }
             
         // map this level to the tile provider index
-        _providerIndices[maxLevel] = _levelTileProviders.size() - 1;
+        _providerIndices[maxLevel] = static_cast<int>(_levelTileProviders.size()) - 1;
     }
 
     // Fill in the gaps (value -1) in provider indices, from back to end
-    for (int i = _providerIndices.size() - 2; i >= 0; --i) {
+    for (int i = static_cast<int>(_providerIndices.size()) - 2; i >= 0; --i) {
         if(_providerIndices[i] == -1){
             _providerIndices[i] = _providerIndices[i+1];
         }
@@ -151,7 +151,7 @@ void TileProviderByLevel::reset() {
 }
 
 int TileProviderByLevel::maxLevel() {
-    return _providerIndices.size()-1;
+    return static_cast<int>(_providerIndices.size() - 1);
 }
 
 int TileProviderByLevel::providerIndex(int level) const {
diff --git a/modules/globebrowsing/tile/tiletextureinitdata.cpp b/modules/globebrowsing/tile/tiletextureinitdata.cpp
index 492440e36b..97099dbfff 100644
--- a/modules/globebrowsing/tile/tiletextureinitdata.cpp
+++ b/modules/globebrowsing/tile/tiletextureinitdata.cpp
@@ -36,8 +36,8 @@ TileTextureInitData::TileTextureInitData(size_t width, size_t height, GLenum glT
                                          ShouldAllocateDataOnCPU shouldAllocateDataOnCPU)
     : _glType(glType)
     , _ghoulTextureFormat(textureFormat)
-    , _padTiles(padTiles)
     , _shouldAllocateDataOnCPU(shouldAllocateDataOnCPU)
+    , _padTiles(padTiles)
 {
     _tilePixelStartOffset = padTiles ? TilePixelStartOffset : glm::ivec2(0);
     _tilePixelSizeDifference = padTiles ? TilePixelSizeDifference : glm::ivec2(0);