diff --git a/data/scene/sun/sun.mod b/data/scene/sun/sun.mod
index c59a37ecd9..1d1bfec046 100644
--- a/data/scene/sun/sun.mod
+++ b/data/scene/sun/sun.mod
@@ -51,7 +51,7 @@ return {
             Size = 1.3*10^10.5,
             Origin = "Center",
             Billboard = true,
-            Texture = "textures/sun-glare.png",
+            Texture = "textures/halo.png",
             BlendMode = "Additive"
         },
         Transform = {
diff --git a/ext/ghoul b/ext/ghoul
index 7a4076c453..7463fe3cc0 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 7a4076c453a58ac750feb08f9e93d0bde3fd2e1d
+Subproject commit 7463fe3cc005565e64e50dd13c1d50e45fcf6c2e
diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index 215f3f0fe3..58d8d1d9fa 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -32,7 +32,7 @@
 #include <openspace/interaction/navigationhandler.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
-#include <openspace/util/distanceconversion.h>>
+#include <openspace/util/distanceconversion.h>
 #include <openspace/util/timeconversion.h>
 #include <openspace/util/timemanager.h>
 
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequencesetup.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequencesetup.cpp
index 4547f444f2..0ca663d969 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequencesetup.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequencesetup.cpp
@@ -342,7 +342,12 @@ bool RenderableFieldlinesSequence::extractMandatoryInfoFromDictionary(
                 [inputFileTypeString](std::string str) {
                     const size_t extLength = inputFileTypeString.length();
                     std::string sub = str.substr(str.length() - extLength, extLength);
-                    std::transform(sub.begin(), sub.end(), sub.begin(), ::tolower);
+                    std::transform(
+                        sub.begin(),
+                        sub.end(),
+                        sub.begin(),
+                        [](char c) { return static_cast<char>(::tolower(c)); }
+                    );
                     return sub != inputFileTypeString;
                 }), _sourceFiles.end());
         // Ensure that there are available and valid source files left
@@ -416,7 +421,12 @@ void RenderableFieldlinesSequence::extractOptionalInfoFromDictionary(
 bool RenderableFieldlinesSequence::extractJsonInfoFromDictionary(fls::Model& model) {
     std::string modelStr;
     if (_dictionary->getValue(KeyJsonSimulationModel, modelStr)) {
-        std::transform(modelStr.begin(), modelStr.end(), modelStr.begin(), ::tolower);
+        std::transform(
+            modelStr.begin(),
+            modelStr.end(),
+            modelStr.begin(),
+            [](char c) { return static_cast<char>(::tolower(c)); }
+        );
         model = fls::stringToModel(modelStr);
     } else {
         LERROR(_name << ": Must specify '" << KeyJsonSimulationModel << "'");
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
index be5a64d975..b46d64f14b 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
@@ -28,9 +28,21 @@
 #include <modules/fieldlinessequence/util/fieldlinesstate.h>
 
 #ifdef OPENSPACE_MODULE_KAMELEON_ENABLED
-    #include <ccmc/Kameleon.h>
-    #include <ccmc/KameleonInterpolator.h>
-    #include <modules/kameleon/include/kameleonhelper.h>
+
+#ifdef _MSC_VER
+#pragma warning (push)
+ // Boost throws #pragma warning: there is no warning number '4675'
+#pragma warning (disable : 4619)
+#endif // _MSC_VER
+
+#include <ccmc/Kameleon.h>
+#include <ccmc/KameleonInterpolator.h>
+#include <modules/kameleon/include/kameleonhelper.h>
+
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif // _MSC_VER
+
 #endif // OPENSPACE_MODULE_KAMELEON_ENABLED
 
 #include <ghoul/logging/logmanager.h>
diff --git a/modules/globebrowsing/cache/memoryawaretilecache.cpp b/modules/globebrowsing/cache/memoryawaretilecache.cpp
index 65d75d83bc..f907edd645 100644
--- a/modules/globebrowsing/cache/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/cache/memoryawaretilecache.cpp
@@ -267,7 +267,7 @@ void MemoryAwareTileCache::createTileAndPut(ProviderTileKey key,
             ghoul_assert(texture->dataOwnership(),
                 "Texture must have ownership of old data to avoid leaks");
             texture->setPixelData(rawTile->imageData, Texture::TakeOwnership::Yes);
-            size_t expectedDataSize = texture->expectedPixelDataSize();
+            [[ maybe_unused ]] size_t expectedDataSize = texture->expectedPixelDataSize();
             size_t numBytes = rawTile->textureInitData->totalNumBytes();
             ghoul_assert(expectedDataSize == numBytes, "Pixel data size is incorrect");
             _numTextureBytesAllocatedOnCPU += numBytes - previousExpectedDataSize;
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index d3bed24ac7..621fc2eb82 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -54,7 +54,19 @@
 
 #ifdef GLOBEBROWSING_USE_GDAL
 #include <gdal.h>
+
+#ifdef _MSC_VER
+#pragma warning (push)
+// CPL throws warning about missing DLL interface
+#pragma warning (disable : 4251)
+#endif // _MSC_VER
+
 #include <cpl_string.h>
+
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif // _MSC_VER
+
 #endif // GLOBEBROWSING_USE_GDAL
 
 #include "globebrowsingmodule_lua.inl"
diff --git a/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.cpp b/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.cpp
index 9b324a9700..1073e70e64 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.cpp
+++ b/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.cpp
@@ -37,12 +37,22 @@
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/dictionary.h>
 
+#ifdef _MSC_VER
+#pragma warning (push)
+ // CPL throws warning about missing DLL interface
+#pragma warning (disable : 4251)
+#endif // _MSC_VER
+
 #include <ogr_featurestyle.h>
 #include <ogr_spatialref.h>
 #include <cpl_virtualmem.h>
 
 #include <gdal_priv.h>
 
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif // _MSC_VER
+
 #include <algorithm>
 
 namespace openspace::globebrowsing {
diff --git a/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.cpp b/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.cpp
index 062b4cfc4b..20dd4a0dbb 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.cpp
+++ b/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.cpp
@@ -361,8 +361,8 @@ PixelRegion::PixelCoordinate RawTileDataReader::geodeticToPixel(
     // ref: https://www.wolframalpha.com/input/?i=X+%3D+a0+%2B+a1P+%2B+a2L,
     //      +Y+%3D+b0+%2B+b1P+%2B+b2L,+solve+for+P+and+L
 
-    double Xp = a[0] + P*a[1] + L*a[2];
-    double Yp = b[0] + P*b[1] + L*b[2];
+    [[ maybe_unused ]] double Xp = a[0] + P*a[1] + L*a[2];
+    [[ maybe_unused ]] double Yp = b[0] + P*b[1] + L*b[2];
 
     ghoul_assert(std::abs(X - Xp) < 1e-10, "inverse should yield X as before");
     ghoul_assert(std::abs(Y - Yp) < 1e-10, "inverse should yield Y as before");
diff --git a/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp b/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
index 8d585addbe..0b12503e4c 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
+++ b/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
@@ -25,8 +25,19 @@
 #include <modules/globebrowsing/tile/rawtiledatareader/tiledatatype.h>
 
 #ifdef GLOBEBROWSING_USE_GDAL
+#ifdef _MSC_VER
+#pragma warning (push)
+ // CPL throws warning about missing DLL interface
+#pragma warning (disable : 4251)
+#endif // _MSC_VER
+
 #include <ogr_featurestyle.h>
 #include <ogr_spatialref.h>
+
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif // _MSC_VER
+
 #endif // GLOBEBROWSING_USE_GDAL
 
 #include <ghoul/logging/logmanager.h>
diff --git a/modules/iswa/util/dataprocessor.cpp b/modules/iswa/util/dataprocessor.cpp
index 7132ba55a2..421a8ff2c4 100644
--- a/modules/iswa/util/dataprocessor.cpp
+++ b/modules/iswa/util/dataprocessor.cpp
@@ -173,7 +173,7 @@ void DataProcessor::calculateFilterValues(std::vector<int> selectedOptions) {
                     standardDeviation,
                     _normValues
                 );
-                filterWidth = fabs(0.5-normalizeWithStandardScore(
+                filterWidth = fabs(0.5f-normalizeWithStandardScore(
                     filterWidth,
                     mean,
                     standardDeviation,
diff --git a/modules/kameleon/src/kameleonhelper.cpp b/modules/kameleon/src/kameleonhelper.cpp
index 6d52f5d01a..f3b02a7069 100644
--- a/modules/kameleon/src/kameleonhelper.cpp
+++ b/modules/kameleon/src/kameleonhelper.cpp
@@ -26,7 +26,18 @@
 
 #include <openspace/util/time.h>
 
+#ifdef _MSC_VER
+#pragma warning (push)
+// Boost throws #pragma warning: there is no warning number '4675'
+#pragma warning (disable : 4619)
+#endif // _MSC_VER
+
 #include <ccmc/Kameleon.h>
+
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif // _MSC_VER
+
 #include <ghoul/logging/logmanager.h>
 
 
diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp
index a38a2e03f4..5df2265aa5 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.cpp
+++ b/modules/spacecraftinstruments/util/hongkangparser.cpp
@@ -297,11 +297,7 @@ bool HongKangParser::augmentWithSpice(Image& image, std::string spacecraft,
                                       std::vector<std::string> potentialTargets)
 {
     image.target = "VOID";
-    // we have (?) to cast to int, unfortunately
-    // Why? --abock
-    // because: old comment --m
-
-    int exposureTime = image.timeRange.duration();
+    int exposureTime = static_cast<int>(image.timeRange.duration());
     if (exposureTime == 0) {
         exposureTime = 1;
     }
diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp
index 9bcb77fe04..0fc502bb7c 100644
--- a/modules/touch/src/touchinteraction.cpp
+++ b/modules/touch/src/touchinteraction.cpp
@@ -1034,11 +1034,11 @@ void TouchInteraction::step(double dt) {
             directionToCenter = normalize(-centerToCam);
             dvec3 lookUpWhenFacingCenter = globalCamRot *
                                            dvec3(_camera->lookUpVectorCameraSpace());
-            dmat4 lookAtMat = lookAt(
+            dmat4 lookAtMatrix = lookAt(
                 dvec3(0, 0, 0),
                 directionToCenter,
                 lookUpWhenFacingCenter);
-            globalCamRot = normalize(quat_cast(inverse(lookAtMat)));
+            globalCamRot = normalize(quat_cast(inverse(lookAtMatrix)));
         }
         { // Zooming
             centerToBoundingSphere = -directionToCenter * boundingSphere;
diff --git a/openspace.cfg b/openspace.cfg
index bbb6b007fc..6dc5dfc39b 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -92,8 +92,8 @@ return {
         ShowNodeNames = true,
         ShowProgressbar = true
     },
-    CheckOpenGLState = true,
-    LogEachOpenGLCall = true,
+    CheckOpenGLState = false,
+    LogEachOpenGLCall = false,
 
     ShutdownCountdown = 3,
     -- OnScreenTextScaling = "framebuffer",
diff --git a/support/cmake/set_openspace_compile_settings.cmake b/support/cmake/set_openspace_compile_settings.cmake
index 36118936b7..1e94d55467 100644
--- a/support/cmake/set_openspace_compile_settings.cmake
+++ b/support/cmake/set_openspace_compile_settings.cmake
@@ -56,7 +56,8 @@ function (set_openspace_compile_settings project)
         "/w44548"   # expression before comma has no effect; expected expression with side-effect
         "/w44549"   # 'operator': operator before comma has no effect; did you intend 'operator'?
         "/w44555"   # expression has no effect; expected expression with side-effect
-        "/w44574"   # 'identifier' is defined to be '0': did you mean to use '#if identifier'?
+        # This is disabled until GLM is updated to version 0.9.9 that removes occurrance of this warning
+        # "/w44574"   # 'identifier' is defined to be '0': did you mean to use '#if identifier'?
         "/w44608"   # 'symbol1' has already been initialized by another union member in the initializer list, 'symbol2'
         "/w44619"   # #pragma warning: there is no warning number 'number'
         "/w44628"   # digraphs not supported with -Ze. Character sequence 'digraph' not interpreted as alternate token for 'char'