diff --git a/ext/ghoul b/ext/ghoul
index 6944475ee6..d7aec4688b 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 6944475ee6293e4dd6671800cb28953e877e1cb7
+Subproject commit d7aec4688b9673d61e8885f3ce7a0d569b54b614
diff --git a/include/openspace/properties/numericalproperty.inl b/include/openspace/properties/numericalproperty.inl
index c0a07e3127..95b027b692 100644
--- a/include/openspace/properties/numericalproperty.inl
+++ b/include/openspace/properties/numericalproperty.inl
@@ -159,17 +159,17 @@ namespace openspace::properties {
     template <>                                                                          \
     template <>                                                                          \
     bool PropertyDelegate<TemplateProperty<TYPE>>::toLuaValue<TYPE>(lua_State* lua,      \
-                                                                    TYPE value)          \
+                                                                    TYPE val)            \
     {                                                                                    \
-        return TO_LUA_LAMBDA_EXPRESSION(lua, value);                                     \
+        return TO_LUA_LAMBDA_EXPRESSION(lua, val);                                       \
     }                                                                                    \
                                                                                          \
     template <>                                                                          \
     template <>                                                                          \
     bool PropertyDelegate<NumericalProperty<TYPE>>::toLuaValue<TYPE>(lua_State* state,   \
-                                                                     TYPE value)         \
+                                                                     TYPE val)           \
     {                                                                                    \
-        return PropertyDelegate<TemplateProperty<TYPE>>::toLuaValue<TYPE>(state, value); \
+        return PropertyDelegate<TemplateProperty<TYPE>>::toLuaValue<TYPE>(state, val);   \
     }                                                                                    \
                                                                                          \
     template <>                                                                          \
diff --git a/include/openspace/properties/templateproperty.inl b/include/openspace/properties/templateproperty.inl
index 32ecffb1ab..b21ff70211 100644
--- a/include/openspace/properties/templateproperty.inl
+++ b/include/openspace/properties/templateproperty.inl
@@ -106,16 +106,17 @@ namespace openspace::properties {
     template <>                                                                          \
     template <>                                                                          \
     TYPE PropertyDelegate<TemplateProperty<TYPE>>::fromLuaValue<TYPE>(lua_State* l,      \
-                                                                      bool& s)           \
+                                                                      bool& successful)  \
     {                                                                                    \
-        return FROM_LUA_LAMBDA_EXPRESSION(l, s);                                         \
+        return FROM_LUA_LAMBDA_EXPRESSION(l, successful);                                \
     }                                                                                    \
                                                                                          \
     template <>                                                                          \
     template <>                                                                          \
-    bool PropertyDelegate<TemplateProperty<TYPE>>::toLuaValue<TYPE>(lua_State* l, TYPE v)\
+    bool PropertyDelegate<TemplateProperty<TYPE>>::toLuaValue<TYPE>(lua_State* l,        \
+                                                                    TYPE value)          \
     {                                                                                    \
-        return TO_LUA_LAMBDA_EXPRESSION(l, v);                                           \
+        return TO_LUA_LAMBDA_EXPRESSION(l, value);                                       \
     }                                                                                    \
                                                                                          \
     template <>                                                                          \
@@ -125,10 +126,10 @@ namespace openspace::properties {
                                                                                          \
     template <>                                                                          \
     template <>                                                                          \
-    TYPE PropertyDelegate<TemplateProperty<TYPE>>::fromString(std::string v,             \
-                                                              bool& s)                   \
+    TYPE PropertyDelegate<TemplateProperty<TYPE>>::fromString(std::string value,         \
+                                                              bool& successful)          \
     {                                                                                    \
-        return FROM_STRING_LAMBDA_EXPRESSION(v, s);                                      \
+        return FROM_STRING_LAMBDA_EXPRESSION(value, successful);                         \
     }                                                                                    \
                                                                                          \
     template <>                                                                          \
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index 1f6a28e4e7..9ba2a62fcc 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -259,7 +259,7 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
     setPscUniforms(*_shader.get(), data.camera, data.position);
 
     if (_fadeOutThreshold > -1.0) {
-        float distCamera = glm::distance(
+        double distCamera = glm::distance(
             data.camera.positionVec3(),
             data.position.dvec3()
         );
diff --git a/modules/base/rotation/fixedrotation.cpp b/modules/base/rotation/fixedrotation.cpp
index df05dbb397..4719adbfee 100644
--- a/modules/base/rotation/fixedrotation.cpp
+++ b/modules/base/rotation/fixedrotation.cpp
@@ -544,7 +544,7 @@ void FixedRotation::update(const UpdateData&) {
     glm::vec3 y = yAxis();
     glm::vec3 z = zAxis();
 
-    static const float Epsilon = 1e-3;
+    static const float Epsilon = 1e-3f;
 
     if (glm::dot(x, y) > 1.f - Epsilon ||
         glm::dot(y, z) > 1.f - Epsilon ||
diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp
index 03ff884a7d..4840de00b5 100644
--- a/modules/base/rotation/luarotation.cpp
+++ b/modules/base/rotation/luarotation.cpp
@@ -110,7 +110,9 @@ void LuaRotation::update(const UpdateData& data) {
     auto now = high_resolution_clock::now();
     lua_pushnumber(
         _state,
-        duration_cast<milliseconds>(now.time_since_epoch()).count()
+        static_cast<lua_Number>(
+            duration_cast<milliseconds>(now.time_since_epoch()).count()
+        )
     );
 
     // Execute the scaling function
diff --git a/modules/base/scale/luascale.cpp b/modules/base/scale/luascale.cpp
index a688351003..eb3194303a 100644
--- a/modules/base/scale/luascale.cpp
+++ b/modules/base/scale/luascale.cpp
@@ -101,7 +101,9 @@ void LuaScale::update(const UpdateData& data) {
     auto now = high_resolution_clock::now();
     lua_pushnumber(
         _state,
-        duration_cast<milliseconds>(now.time_since_epoch()).count()
+        static_cast<lua_Number>(
+            duration_cast<milliseconds>(now.time_since_epoch()).count()
+        )
     );
 
     // Execute the scaling function
diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp
index 7dd8353d9e..bb5e3ddcc3 100644
--- a/modules/base/translation/luatranslation.cpp
+++ b/modules/base/translation/luatranslation.cpp
@@ -118,7 +118,9 @@ void LuaTranslation::update(const UpdateData& data) {
     auto now = high_resolution_clock::now();
     lua_pushnumber(
         _state,
-        duration_cast<milliseconds>(now.time_since_epoch()).count()
+        static_cast<lua_Number>(
+            duration_cast<milliseconds>(now.time_since_epoch()).count()
+        )
     );
 
     // Execute the scaling function
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequencesetup.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequencesetup.cpp
index 538186e5e0..4547f444f2 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequencesetup.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequencesetup.cpp
@@ -303,8 +303,12 @@ bool RenderableFieldlinesSequence::extractMandatoryInfoFromDictionary(
         LERROR(_name << ": The field " << std::string(KeyInputFileType) << " is missing!");
         return false;
     } else {
-        std::transform(inputFileTypeString.begin(), inputFileTypeString.end(),
-                       inputFileTypeString.begin(), ::tolower);
+        std::transform(
+            inputFileTypeString.begin(),
+            inputFileTypeString.end(),
+            inputFileTypeString.begin(),
+            [](char c) { return static_cast<char>(tolower(c)); }
+        );
         // Verify that the input type is correct
         if (inputFileTypeString == ValueInputFileTypeCdf) {
             sourceFileType = SourceFileType::Cdf;
diff --git a/modules/fieldlinessequence/util/fieldlinesstate.cpp b/modules/fieldlinessequence/util/fieldlinesstate.cpp
index 51c8b7b0d9..d55ba96569 100644
--- a/modules/fieldlinessequence/util/fieldlinesstate.cpp
+++ b/modules/fieldlinessequence/util/fieldlinesstate.cpp
@@ -373,7 +373,7 @@ void FieldlinesState::saveStateToJson(const std::string& absPath) {
 
 // Returns one of the extra quantity vectors, _extraQuantities[index].
 // If index is out of scope an empty vector is returned and the referenced bool is false.
-const std::vector<float>&  FieldlinesState::extraQuantity(const size_t index,
+std::vector<float> FieldlinesState::extraQuantity(const size_t index,
                                                           bool& isSuccessful) const {
     if (index < _extraQuantities.size()) {
         isSuccessful = true;
diff --git a/modules/fieldlinessequence/util/fieldlinesstate.h b/modules/fieldlinessequence/util/fieldlinesstate.h
index 66d417deff..10a1faa4ae 100644
--- a/modules/fieldlinessequence/util/fieldlinesstate.h
+++ b/modules/fieldlinessequence/util/fieldlinesstate.h
@@ -64,7 +64,7 @@ public:
     const std::vector<glm::vec3>&          vertexPositions()    const;
 
     // Special getter. Returns extraQuantities[INDEX].
-    const std::vector<float>& extraQuantity(const size_t INDEX, bool& isSuccesful) const;
+    std::vector<float> extraQuantity(const size_t INDEX, bool& isSuccesful) const;
 
     void setModel(const fls::Model m)   { _model = m; }
     void setTriggerTime(const double t) { _triggerTime = t; }
diff --git a/modules/galaxy/rendering/galaxyraycaster.cpp b/modules/galaxy/rendering/galaxyraycaster.cpp
index 1c3ed1d186..f5f7fc83a3 100644
--- a/modules/galaxy/rendering/galaxyraycaster.cpp
+++ b/modules/galaxy/rendering/galaxyraycaster.cpp
@@ -115,9 +115,7 @@ void GalaxyRaycaster::preRaycast(const RaycastData& data,
     program.setUniform(galaxyTextureUniformName, *_textureUnit);
 }
 
-void GalaxyRaycaster::postRaycast(const RaycastData& data,
-                                  ghoul::opengl::ProgramObject& program)
-{
+void GalaxyRaycaster::postRaycast(const RaycastData&, ghoul::opengl::ProgramObject&) {
     _textureUnit = nullptr; // release texture unit.
 }
 
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index 6ef4b4c635..39e7432dcd 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -340,22 +340,22 @@ void RenderableGalaxy::render(const RenderData& data, RendererTasks& tasks) {
     float maxDim = std::max(std::max(galaxySize.x, galaxySize.y), galaxySize.z);
     
 
-    float lowerRampStart = maxDim * 0.02;
-    float lowerRampEnd = maxDim * 0.5;
+    float lowerRampStart = maxDim * 0.02f;
+    float lowerRampEnd = maxDim * 0.5f;
 
-    float upperRampStart = maxDim * 2.0;
-    float upperRampEnd = maxDim * 10;
+    float upperRampStart = maxDim * 2.f;
+    float upperRampEnd = maxDim * 10.f;
 
-    float opacityCoefficient = 1.0;
+    float opacityCoefficient = 1.f;
 
     if (length < lowerRampStart) {
-        opacityCoefficient = 0; // camera really close
+        opacityCoefficient = 0.f; // camera really close
     } else if (length < lowerRampEnd) {
         opacityCoefficient = (length - lowerRampStart) / (lowerRampEnd - lowerRampStart);
     } else if (length < upperRampStart) {
-        opacityCoefficient = 1.0; // sweet spot (max)
+        opacityCoefficient = 1.f; // sweet spot (max)
     } else if (length < upperRampEnd) {
-        opacityCoefficient = 1.0 - (length - upperRampStart) /
+        opacityCoefficient = 1.f - (length - upperRampStart) /
                              (upperRampEnd - upperRampStart); //fade out
     } else {
         opacityCoefficient = 0;
@@ -363,7 +363,7 @@ void RenderableGalaxy::render(const RenderData& data, RendererTasks& tasks) {
 
     _opacityCoefficient = opacityCoefficient;
     ghoul_assert(
-        _opacityCoefficient >= 0.0 && _opacityCoefficient <= 1.0,
+        _opacityCoefficient >= 0.f && _opacityCoefficient <= 1.f,
         "Opacity coefficient was not between 0 and 1"
     );
     if (opacityCoefficient > 0) {
diff --git a/modules/globebrowsing/cache/memoryawaretilecache.cpp b/modules/globebrowsing/cache/memoryawaretilecache.cpp
index 6cc13be786..ab4cf6ec52 100644
--- a/modules/globebrowsing/cache/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/cache/memoryawaretilecache.cpp
@@ -301,7 +301,8 @@ void MemoryAwareTileCache::update() {
 size_t MemoryAwareTileCache::getGPUAllocatedDataSize() const {
     return std::accumulate(
         _textureContainerMap.cbegin(),
-        _textureContainerMap.cend(), 0,
+        _textureContainerMap.cend(),
+        size_t(0),
         [](size_t s, const std::pair<const TileTextureInitData::HashKey,
         TextureContainerTileCache>& p)
         {
@@ -316,7 +317,8 @@ size_t MemoryAwareTileCache::getGPUAllocatedDataSize() const {
 size_t MemoryAwareTileCache::getCPUAllocatedDataSize() const {
     size_t dataSize = std::accumulate(
         _textureContainerMap.cbegin(),
-        _textureContainerMap.cend(), 0,
+        _textureContainerMap.cend(),
+        size_t(0),
         [](size_t s, const std::pair<const TileTextureInitData::HashKey,
         TextureContainerTileCache>& p)
         {
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 85c6e6d040..b217d08138 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -162,8 +162,8 @@ int goToGeo(lua_State* L) {
         return luaL_error(L, "Expected 2 or 3 arguments.");
     }
 
-    double latitude = static_cast<double>(lua_tonumber(L, 1));
-    double longitude = static_cast<double>(lua_tonumber(L, 2));
+    double latitude = lua_tonumber(L, 1);
+    double longitude = lua_tonumber(L, 2);
 
     if (nArguments == 2) {
         OsEng.moduleEngine().module<GlobeBrowsingModule>()->goToGeo(latitude, longitude);
diff --git a/modules/globebrowsing/meshes/trianglesoup.cpp b/modules/globebrowsing/meshes/trianglesoup.cpp
index 428aa3ed98..7ae355db65 100644
--- a/modules/globebrowsing/meshes/trianglesoup.cpp
+++ b/modules/globebrowsing/meshes/trianglesoup.cpp
@@ -87,7 +87,7 @@ void TriangleSoup::setElements(std::vector<unsigned int> elements) {
     _elementData.resize(elements.size());
     _gpuDataNeedUpdate = true;
     for (size_t i = 0; i < elements.size(); i++) {
-        _elementData[i] = static_cast<GLuint>(elements[i]);
+        _elementData[i] = elements[i];
     }
 }
 
@@ -128,8 +128,8 @@ bool TriangleSoup::updateDataOnGPU() {
     // Positions at location 0
     if (_useVertexPositions) {
         glEnableVertexAttribArray(0);
-        glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(Vertex),
-            reinterpret_cast<const GLvoid*>(offsetof(Vertex, position)));
+        glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(Vertex), nullptr);
+            //reinterpret_cast<const GLvoid*>(offsetof(Vertex, position)));
     }
     // Textures at location 1
     if (_useTextureCoordinates) {
diff --git a/modules/globebrowsing/other/pixelbuffer.cpp b/modules/globebrowsing/other/pixelbuffer.cpp
index c34050495a..001a2a8018 100644
--- a/modules/globebrowsing/other/pixelbuffer.cpp
+++ b/modules/globebrowsing/other/pixelbuffer.cpp
@@ -38,7 +38,7 @@ PixelBuffer::PixelBuffer(size_t numBytes, Usage usage)
 {
     glGenBuffers(1, &_id);
     bind();
-    glBufferData(GL_PIXEL_UNPACK_BUFFER, _numBytes, 0, static_cast<GLenum>(_usage));
+    glBufferData(GL_PIXEL_UNPACK_BUFFER, _numBytes, nullptr, static_cast<GLenum>(_usage));
     unbind();
 }
 
diff --git a/modules/globebrowsing/rendering/chunkrenderer.cpp b/modules/globebrowsing/rendering/chunkrenderer.cpp
index b420caa61f..bb712a6fee 100644
--- a/modules/globebrowsing/rendering/chunkrenderer.cpp
+++ b/modules/globebrowsing/rendering/chunkrenderer.cpp
@@ -293,7 +293,7 @@ void ChunkRenderer::renderChunkLocally(const Chunk& chunk, const RenderData& dat
         Geodetic2 corner = chunk.surfacePatch().getCorner(q);
         glm::dvec3 cornerModelSpace = ellipsoid.cartesianSurfacePosition(corner);
         glm::dvec3 cornerCameraSpace =
-            glm::dvec3(dmat4(modelViewTransform) * glm::dvec4(cornerModelSpace, 1));
+            glm::dvec3(modelViewTransform * glm::dvec4(cornerModelSpace, 1));
         cornersCameraSpace[i] = cornerCameraSpace;
         programObject->setUniform(cornerNames[i], vec3(cornerCameraSpace));
     }
diff --git a/modules/globebrowsing/tile/pixelregion.cpp b/modules/globebrowsing/tile/pixelregion.cpp
index fabd02f3a7..6e884e4c50 100644
--- a/modules/globebrowsing/tile/pixelregion.cpp
+++ b/modules/globebrowsing/tile/pixelregion.cpp
@@ -118,12 +118,12 @@ void PixelRegion::scale(double s) {
 
 void PixelRegion::downscalePow2(int exponent, PixelCoordinate wrt) {
     start += wrt;
-    start.x = ceil(start.x / static_cast<float>(pow(2, exponent)));// >>= exponent;
-    start.y = ceil(start.y / static_cast<float>(pow(2, exponent)));// >>= exponent;
+    start.x = static_cast<int>(ceil(start.x / static_cast<float>(pow(2, exponent))));
+    start.y = static_cast<int>(ceil(start.y / static_cast<float>(pow(2, exponent))));
     numPixels.x =
-        ceil(numPixels.x / static_cast<float>(pow(2, exponent)));// >>= exponent;
+        static_cast<int>(ceil(numPixels.x / static_cast<float>(pow(2, exponent))));
     numPixels.y =
-        ceil(numPixels.y / static_cast<float>(pow(2, exponent)));// >>= exponent;
+        static_cast<int>(ceil(numPixels.y / static_cast<float>(pow(2, exponent))));
     start -= wrt;
 }
 
diff --git a/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.cpp b/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.cpp
index 38b1198d33..8c02c7ddb7 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.cpp
+++ b/modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.cpp
@@ -126,12 +126,17 @@ void GdalRawTileDataReader::initialize() {
 
     // Assume all raster bands have the same data type
     _gdalDatasetMetaDataCached.rasterCount = _dataset->GetRasterCount();
-    _gdalDatasetMetaDataCached.scale = _dataset->GetRasterBand(1)->GetScale();
-    _gdalDatasetMetaDataCached.offset = _dataset->GetRasterBand(1)->GetOffset();
+    _gdalDatasetMetaDataCached.scale = static_cast<float>(
+        _dataset->GetRasterBand(1)->GetScale()
+    );
+    _gdalDatasetMetaDataCached.offset = static_cast<float>(
+        _dataset->GetRasterBand(1)->GetOffset()
+    );
     _gdalDatasetMetaDataCached.rasterXSize = _dataset->GetRasterXSize();
     _gdalDatasetMetaDataCached.rasterYSize = _dataset->GetRasterYSize();
-    _gdalDatasetMetaDataCached.noDataValue =
-        _dataset->GetRasterBand(1)->GetNoDataValue();
+    _gdalDatasetMetaDataCached.noDataValue = static_cast<float>(
+        _dataset->GetRasterBand(1)->GetNoDataValue()
+    );
     _gdalDatasetMetaDataCached.dataType =
         tiledatatype::getGdalDataType(_initData.glType());
 
@@ -145,7 +150,7 @@ void GdalRawTileDataReader::initialize() {
         calculateTileLevelDifference(_initData.dimensions().x);
 
     int numOverviews = _dataset->GetRasterBand(1)->GetOverviewCount();
-    _cached._maxLevel = -_cached._tileLevelDifference;
+    _cached._maxLevel = static_cast<int>(-_cached._tileLevelDifference);
     if (numOverviews > 0) {
         _cached._maxLevel += numOverviews - 1;
     }
@@ -191,7 +196,7 @@ RawTile::ReadError GdalRawTileDataReader::rasterRead(
         io.write.region.numPixels.y,    // width to write y in destination
         _gdalDatasetMetaDataCached.dataType,         // Type
         static_cast<int>(_initData.bytesPerPixel()), // Pixel spacing
-        static_cast<int>(-io.write.bytesPerLine)     // Line spacing
+        -static_cast<int>(io.write.bytesPerLine)     // Line spacing
     );
 
     // Convert error to RawTile::ReadError
@@ -236,7 +241,7 @@ int GdalRawTileDataReader::calculateTileLevelDifference(int minimumPixelSize) co
     }
     int sizeLevel0 = maxOverview->GetXSize();
     double diff = log2(minimumPixelSize) - log2(sizeLevel0);
-    return diff;
+    return static_cast<int>(diff);
 }
 
 } // namespace openspace::globebrowsing
diff --git a/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.cpp b/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.cpp
index ed49aa1620..062b4cfc4b 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.cpp
+++ b/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.cpp
@@ -577,7 +577,7 @@ TileDepthTransform RawTileDataReader::calculateTileDepthTransform() {
 
     TileDepthTransform transform;
     transform.depthOffset = depthOffset();
-    transform.depthScale = depthScale() * maximumValue;
+    transform.depthScale = static_cast<float>(depthScale() * maximumValue);
     return transform;
 }
 
diff --git a/modules/globebrowsing/tile/rawtiledatareader/simplerawtiledatareader.cpp b/modules/globebrowsing/tile/rawtiledatareader/simplerawtiledatareader.cpp
index 46d8c6052d..596e24b9c2 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/simplerawtiledatareader.cpp
+++ b/modules/globebrowsing/tile/rawtiledatareader/simplerawtiledatareader.cpp
@@ -115,14 +115,16 @@ RawTile::ReadError SimpleRawTileDataReader::rasterRead(
                 y * _initData.bytesPerLine() +
                 x * _initData.bytesPerPixel();
 
-            int xInSource =
+            int xInSource = static_cast<int>(
                 io.read.region.start.x +
                 static_cast<float>(x) / io.write.region.numPixels.x *
-                io.read.region.numPixels.x;
-            int yInSource =
+                io.read.region.numPixels.x
+            );
+            int yInSource = static_cast<int>(
                 io.read.region.start.y +
                 static_cast<float>(y) / io.write.region.numPixels.y *
-                io.read.region.numPixels.y;
+                io.read.region.numPixels.y
+            );
 
             glm::vec4 sourceTexel = _dataTexture->texelAsFloat(xInSource, yInSource);
 
@@ -141,7 +143,7 @@ RawTile::ReadError SimpleRawTileDataReader::rasterRead(
                     char value = static_cast<char>(
                         sourceTexel[rasterBand - 1] * 255
                     );
-                    *reinterpret_cast<char*>(pixelWriteDestination) = value;
+                    *pixelWriteDestination = value;
                     break;
                 }
                 case GL_UNSIGNED_SHORT: {
diff --git a/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp b/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
index ff2811e1ab..ae7b55fe98 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
+++ b/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
@@ -141,6 +141,7 @@ TextureFormat getTextureFormat(int rasterCount, GDALDataType gdalType) {
                 //    break;
                 default:
                     LERROR("GDAL data type unknown to OpenGL: " << gdalType);
+                    throw ghoul::MissingCaseException();
             }
             break;
         case 2:
@@ -169,6 +170,7 @@ TextureFormat getTextureFormat(int rasterCount, GDALDataType gdalType) {
                     break;
                 default:
                     LERROR("GDAL data type unknown to OpenGL: " << gdalType);
+                    throw ghoul::MissingCaseException();
             }
             break;
         case 3:
@@ -198,6 +200,7 @@ TextureFormat getTextureFormat(int rasterCount, GDALDataType gdalType) {
                 //    break;
                 default:
                     LERROR("GDAL data type unknown to OpenGL: " << gdalType);
+                    throw ghoul::MissingCaseException();
             }
             break;
         case 4:
@@ -227,11 +230,12 @@ TextureFormat getTextureFormat(int rasterCount, GDALDataType gdalType) {
                 //    break;
                 default:
                     LERROR("GDAL data type unknown to OpenGL: " << gdalType);
+                    throw ghoul::MissingCaseException();
             }
             break;
         default:
             LERROR("Unknown number of channels for OpenGL texture: " << rasterCount);
-            break;
+            throw ghoul::MissingCaseException();
     }
     return format;
 }
@@ -267,6 +271,7 @@ TextureFormat getTextureFormatOptimized(int rasterCount, GDALDataType gdalType)
                 //    break;
                 default:
                     LERROR("GDAL data type unknown to OpenGL: " << gdalType);
+                    throw ghoul::MissingCaseException();
             }
             break;
         case 2:
@@ -295,6 +300,7 @@ TextureFormat getTextureFormatOptimized(int rasterCount, GDALDataType gdalType)
                     break;
                 default:
                     LERROR("GDAL data type unknown to OpenGL: " << gdalType);
+                    throw ghoul::MissingCaseException();
             }
             break;
         case 3:
@@ -324,6 +330,7 @@ TextureFormat getTextureFormatOptimized(int rasterCount, GDALDataType gdalType)
                 //    break;
                 default:
                     LERROR("GDAL data type unknown to OpenGL: " << gdalType);
+                    throw ghoul::MissingCaseException();
             }
             break;
         case 4:
@@ -353,11 +360,12 @@ TextureFormat getTextureFormatOptimized(int rasterCount, GDALDataType gdalType)
                 //    break;
                 default:
                     LERROR("GDAL data type unknown to OpenGL: " << gdalType);
+                    throw ghoul::MissingCaseException();
             }
             break;
         default:
             LERROR("Unknown number of channels for OpenGL texture: " << rasterCount);
-            break;
+            throw ghoul::MissingCaseException();
     }
     return format;
 }
@@ -380,7 +388,7 @@ GLenum getOpenGLDataType(GDALDataType gdalType) {
             return GL_DOUBLE;
         default:
             LERROR("GDAL data type unknown to OpenGL: " << gdalType);
-            return GL_UNSIGNED_BYTE;
+            throw ghoul::MissingCaseException();
     }
 }
 
@@ -402,7 +410,7 @@ GDALDataType getGdalDataType(GLenum glType) {
             return GDT_Float64;
         default:
             LERROR("OpenGL data type unknown to GDAL: " << glType);
-            return GDT_Unknown;
+            throw ghoul::MissingCaseException();
     }
 }
 
@@ -410,12 +418,16 @@ GDALDataType getGdalDataType(GLenum glType) {
 
 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:;
-        [[fallthrough]]; case ghoul::opengl::Texture::Format::BGR: return 3;
-        case ghoul::opengl::Texture::Format::RGBA:;
-        [[fallthrough]]; case ghoul::opengl::Texture::Format::BGRA: return 4;
+        case ghoul::opengl::Texture::Format::Red:
+            return 1;
+        case ghoul::opengl::Texture::Format::RG:
+            return 2;
+        case ghoul::opengl::Texture::Format::RGB:
+        case ghoul::opengl::Texture::Format::BGR:
+            return 3;
+        case ghoul::opengl::Texture::Format::RGBA:
+        case ghoul::opengl::Texture::Format::BGRA:
+            return 4;
         default: {
             ghoul_assert(false, "Unknown format");
             return 0;
@@ -436,7 +448,7 @@ size_t numberOfBytes(GLenum glType) {
         case GL_DOUBLE: return sizeof(GLdouble);
         default: {
             ghoul_assert(false, "Unknown data type");
-            return 0;
+            throw ghoul::MissingCaseException();
         }
     }
 }
@@ -455,7 +467,7 @@ size_t getMaximumValue(GLenum glType) {
             return 1ULL << 31ULL;
         default: {
             ghoul_assert(false, "Unknown data type");
-            return 0ULL;
+            throw ghoul::MissingCaseException();
         }
     }
 }
@@ -480,7 +492,7 @@ float interpretFloat(GLenum glType, const char* src) {
             return static_cast<float>(*reinterpret_cast<const GLdouble*>(src));
         default: {
             ghoul_assert(false, "Unknown data type");
-            return 0;
+            throw ghoul::MissingCaseException();
         }
     }
 }
@@ -504,7 +516,7 @@ GLenum glTextureFormat(GLenum glType, ghoul::opengl::Texture::Format format) {
                 default:
                     ghoul_assert(false, "glType data type unknown");
                     LERROR("glType data type unknown: " << glType);
-                    return GLenum(0);
+                    throw ghoul::MissingCaseException();
             }
         case ghoul::opengl::Texture::Format::RG:
             switch (glType) {
@@ -523,7 +535,7 @@ GLenum glTextureFormat(GLenum glType, ghoul::opengl::Texture::Format format) {
                 default:
                     ghoul_assert(false, "glType data type unknown");
                     LERROR("glType data type unknown: " << glType);
-                    return GLenum(0);
+                    throw ghoul::MissingCaseException();
             }
         case ghoul::opengl::Texture::Format::RGB:
             switch (glType) {
@@ -542,7 +554,7 @@ GLenum glTextureFormat(GLenum glType, ghoul::opengl::Texture::Format format) {
                 default:
                     ghoul_assert(false, "glType data type unknown");
                     LERROR("glType data type unknown: " << glType);
-                    return GLenum(0);
+                    throw ghoul::MissingCaseException();
             }
         case ghoul::opengl::Texture::Format::RGBA:
             switch (glType) {
@@ -561,7 +573,7 @@ GLenum glTextureFormat(GLenum glType, ghoul::opengl::Texture::Format format) {
                 default:
                     ghoul_assert(false, "glType data type unknown");
                     LERROR("glType data type unknown: " << glType);
-                    return GLenum(0);
+                    throw ghoul::MissingCaseException();
             }
         case ghoul::opengl::Texture::Format::BGR:
             switch (glType) {
@@ -580,7 +592,7 @@ GLenum glTextureFormat(GLenum glType, ghoul::opengl::Texture::Format format) {
                 default:
                     ghoul_assert(false, "glType data type unknown");
                     LERROR("glType data type unknown: " << glType);
-                    return GLenum(0);
+                    throw ghoul::MissingCaseException();
             }
         case ghoul::opengl::Texture::Format::BGRA:
             switch (glType) {
@@ -599,16 +611,16 @@ GLenum glTextureFormat(GLenum glType, ghoul::opengl::Texture::Format format) {
                 default:
                     ghoul_assert(false, "glType data type unknown");
                     LERROR("glType data type unknown: " << glType);
-                    return GLenum(0);
+                    throw ghoul::MissingCaseException();
             }
         default:
             LERROR(
                 "Unknown format for OpenGL texture: " <<
-                static_cast<std::underlying_type_t<
-                    ghoul::opengl::Texture::Format>
-                >(format)
+                static_cast<std::underlying_type_t<ghoul::opengl::Texture::Format>>(
+                    format
+                )
             );
-            return GLenum(0);
+            throw ghoul::MissingCaseException();
     }
 }
 
diff --git a/modules/globebrowsing/tile/tileindex.cpp b/modules/globebrowsing/tile/tileindex.cpp
index 72f66bb578..01c35b01fa 100644
--- a/modules/globebrowsing/tile/tileindex.cpp
+++ b/modules/globebrowsing/tile/tileindex.cpp
@@ -46,8 +46,8 @@ TileIndex::TileIndex(const TileIndex& other)
     : x(other.x), y(other.y), level(other.level)
 {}
 
-TileIndex::TileIndex(const Geodetic2& point, int level)
-    : level(level)
+TileIndex::TileIndex(const Geodetic2& point, int level_)
+    : level(level_)
 {
     int numIndicesAtLevel = 1 << level;
     double u = 0.5 + point.lon / (2 * glm::pi<double>());
@@ -55,8 +55,8 @@ TileIndex::TileIndex(const Geodetic2& point, int level)
     double xIndexSpace = u * numIndicesAtLevel;
     double yIndexSpace = v * numIndicesAtLevel;
 
-    x = floor(xIndexSpace);
-    y = floor(yIndexSpace);
+    x = static_cast<int>(floor(xIndexSpace));
+    y = static_cast<int>(floor(yIndexSpace));
 }
 
 TileIndex::TileIndex(const ghoul::Dictionary& dict) {
diff --git a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
index af24cfbc68..60a3eeb5d2 100644
--- a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
+++ b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
@@ -500,7 +500,7 @@ std::vector<Time> TimeQuantizer::quantized(const Time& start, const Time& end) c
     const double delta = endSeconds - startSeconds;
 
     ghoul_assert(int(delta) % int(_resolution) == 0, "Quantization error");
-    const int nSteps = delta / _resolution;
+    const int nSteps = static_cast<int>(delta / _resolution);
 
     std::vector<Time> result(nSteps + 1);
     for (int i = 0; i <= nSteps; ++i) {
diff --git a/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.cpp b/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.cpp
index 7f50b0fb33..aa0899328d 100644
--- a/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.cpp
+++ b/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.cpp
@@ -61,7 +61,7 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
                 "Must define key '" + std::string(KeyMaxLevel) + "'"
             );
         }
-        maxLevel = std::round(floatMaxLevel);
+        maxLevel = static_cast<int>(std::round(floatMaxLevel));
 
         ghoul::Dictionary providerDict;
         if (!levelProviderDict.getValue<ghoul::Dictionary>(KeyTileProvider, providerDict))
diff --git a/modules/imgui/src/guimissioncomponent.cpp b/modules/imgui/src/guimissioncomponent.cpp
index b531f071ed..1d64832502 100644
--- a/modules/imgui/src/guimissioncomponent.cpp
+++ b/modules/imgui/src/guimissioncomponent.cpp
@@ -35,7 +35,7 @@
 #include <openspace/util/timemanager.h>
 
 namespace {
-    const ImVec2 size = ImVec2(350, 500);
+    static const ImVec2 Size = ImVec2(350, 500);
 
     void renderMission(const openspace::Mission& mission) {
         // The hashname is necessary since ImGui computes a hash based off the name of the
@@ -99,7 +99,7 @@ GuiMissionComponent::GuiMissionComponent() : GuiComponent("Mission Information")
 
 void GuiMissionComponent::render() {
     bool v = _isEnabled;
-    ImGui::Begin(name().c_str(), &v, size, 0.75f);
+    ImGui::Begin(name().c_str(), &v, Size, 0.75f);
     _isEnabled = v;
 
     ghoul_assert(
diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp
index 0e23c7a945..edd3f16057 100644
--- a/modules/imgui/src/guispacetimecomponent.cpp
+++ b/modules/imgui/src/guispacetimecomponent.cpp
@@ -37,7 +37,7 @@
 #include <openspace/scene/scene.h>
 
 namespace {
-    const ImVec2 size = ImVec2(350, 500);
+    static const ImVec2 Size = ImVec2(350, 500);
 } // namespace
 
 namespace openspace::gui {
@@ -45,7 +45,7 @@ namespace openspace::gui {
 GuiSpaceTimeComponent::GuiSpaceTimeComponent() : GuiComponent("Space/Time") {}
 
 void GuiSpaceTimeComponent::render() {
-    ImGui::Begin(name().c_str(), nullptr, size, 0.5f, ImGuiWindowFlags_AlwaysAutoResize);
+    ImGui::Begin(name().c_str(), nullptr, Size, 0.5f, ImGuiWindowFlags_AlwaysAutoResize);
 
     std::vector<SceneGraphNode*> nodes =
         OsEng.renderEngine().scene()->allSceneGraphNodes();
diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp
index b166a673c2..e43147d71c 100644
--- a/modules/imgui/src/renderproperties.cpp
+++ b/modules/imgui/src/renderproperties.cpp
@@ -138,13 +138,13 @@ void renderOptionProperty(Property* prop, const std::string& ownerName,
         }
         nodeNames += '\0';
 
-        int idx = std::distance(
+        int idx = static_cast<int>(std::distance(
             options.begin(),
             std::find_if(
                 options.begin(),
                 options.end(),
                 [value](const OptionProperty::Option& o) { return o.value == value; }
-        ));
+        )));
 
         int oldIdx = idx;
         ImGui::Combo(name.c_str(), &idx, nodeNames.c_str());
diff --git a/modules/iswa/util/dataprocessor.cpp b/modules/iswa/util/dataprocessor.cpp
index 1fd42840dc..c061df6e6c 100644
--- a/modules/iswa/util/dataprocessor.cpp
+++ b/modules/iswa/util/dataprocessor.cpp
@@ -148,9 +148,7 @@ void DataProcessor::initializeVectors(int numOptions){
 }
 
 void DataProcessor::calculateFilterValues(std::vector<int> selectedOptions) {
-    int numSelected = selectedOptions.size();
-    std::shared_ptr<Histogram> histogram;
-    float mean, standardDeviation, filterMid, filterWidth;
+    int numSelected = static_cast<int>(selectedOptions.size());
 
     _filterValues = glm::vec2(0.0);
     if (numSelected <= 0) {
@@ -159,10 +157,12 @@ void DataProcessor::calculateFilterValues(std::vector<int> selectedOptions) {
 
     if (!_histograms.empty()) {
         for (int option : selectedOptions) {
+            float filterMid;
+            float filterWidth;
             if (!_useHistogram) {
-                mean = (1.0/_numValues[option])*_sum[option];
-                standardDeviation = _standardDeviation[option];
-                histogram = _histograms[option];
+                float mean = (1.f / _numValues[option]) * _sum[option];
+                float standardDeviation = _standardDeviation[option];
+                std::shared_ptr<Histogram> histogram = _histograms[option];
 
                 filterMid = histogram->highestBinValue(_useHistogram);
                 filterWidth = mean+histogram->binWidth();
@@ -196,13 +196,13 @@ void DataProcessor::calculateFilterValues(std::vector<int> selectedOptions) {
 void DataProcessor::add(std::vector<std::vector<float>>& optionValues,
                         std::vector<float>& sum)
 {
-    int numOptions = optionValues.size();
+    int numOptions = static_cast<int>(optionValues.size());
     int numValues;
     float mean, value, variance, standardDeviation;
 
     for (int i=0; i<numOptions; i++) {
         std::vector<float> values = optionValues[i];
-        numValues = values.size();
+        numValues = static_cast<int>(values.size());
 
         variance = 0;
         mean = (1.0f/numValues)*sum[i];
diff --git a/modules/iswa/util/dataprocessorjson.cpp b/modules/iswa/util/dataprocessorjson.cpp
index d56f81010c..425891006d 100644
--- a/modules/iswa/util/dataprocessorjson.cpp
+++ b/modules/iswa/util/dataprocessorjson.cpp
@@ -68,7 +68,7 @@ std::vector<std::string> DataProcessorJson::readMetadata(std::string data,
 void DataProcessorJson::addDataValues(std::string data,
                                       properties::SelectionProperty& dataOptions)
 {
-    int numOptions = dataOptions.options().size();
+    int numOptions = static_cast<int>(dataOptions.options().size());
     initializeVectors(numOptions);
 
     if (!data.empty()) {
@@ -87,7 +87,7 @@ void DataProcessorJson::addDataValues(std::string data,
 
             for(int y=0; y<row.size(); y++){
                 json col = row.at(y);
-                int colsize = col.size();
+                int colsize = static_cast<int>(col.size());
 
                 for(int x=0; x<colsize; x++){
                     value = col.at(x);
@@ -105,32 +105,33 @@ void DataProcessorJson::addDataValues(std::string data,
 }
 
 std::vector<float*> DataProcessorJson::processData(std::string data,
-                                               properties::SelectionProperty& dataOptions,
+                                               properties::SelectionProperty& optionProp,
                                                glm::size3_t& dimensions)
 {
     if (!data.empty()) {
         json j = json::parse(data);
         json variables = j["variables"];
 
-        std::vector<int> selectedOptions = dataOptions.value();
+        std::vector<int> selectedOptions = optionProp.value();
 //        int numSelected = selectedOptions.size();
 
-        auto options = dataOptions.options();
-        int numOptions = options.size();
+        const std::vector<properties::SelectionProperty::Option>& options =
+                                                                     optionProp.options();
+        int numOptions = static_cast<int>(options.size());
 
         float value;
         int rowsize, colsize, i;
 
         std::vector<float*> dataOptions(numOptions, nullptr);
         for(int option : selectedOptions){
-            dataOptions[option] = new float[dimensions.x*dimensions.y]{0.f};
+            dataOptions[option] = new float[dimensions.x*dimensions.y]{ 0.f };
 
             json row = variables[options[option].description];
-            rowsize = row.size();
+            rowsize = static_cast<int>(row.size());
 
             for(int y=0; y<rowsize; y++){
                 json col = row.at(y);
-                colsize = col.size();
+                colsize = static_cast<int>(col.size());
 
                 for(int x=0; x<colsize; x++){
                     value = col.at(x);
diff --git a/modules/iswa/util/dataprocessorkameleon.cpp b/modules/iswa/util/dataprocessorkameleon.cpp
index 36c3b3f3b4..a1f572893f 100644
--- a/modules/iswa/util/dataprocessorkameleon.cpp
+++ b/modules/iswa/util/dataprocessorkameleon.cpp
@@ -25,6 +25,7 @@
 #include <modules/iswa/util/dataprocessorkameleon.h>
 //#include <algorithm>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/glm.h>
 
 namespace {
     const char* _loggerCat = "DataProcessorKameleon";
@@ -43,7 +44,7 @@ DataProcessorKameleon::DataProcessorKameleon()
 DataProcessorKameleon::~DataProcessorKameleon(){}
 
 std::vector<std::string> DataProcessorKameleon::readMetadata(std::string path,
-                                                             glm::size3_t& dimensions)
+                                                             glm::size3_t&)
 {
     if (!path.empty()) {
         if (path != _kwPath || !_kw) {
@@ -71,7 +72,7 @@ std::vector<std::string> DataProcessorKameleon::readMetadata(std::string path,
 void DataProcessorKameleon::addDataValues(std::string path,
                                           properties::SelectionProperty& dataOptions)
 {
-    int numOptions = dataOptions.options().size();
+    int numOptions = static_cast<int>(dataOptions.options().size());
     initializeVectors(numOptions);
 
     if (!path.empty()) {
@@ -83,7 +84,7 @@ void DataProcessorKameleon::addDataValues(std::string path,
         std::vector<std::vector<float>> optionValues(numOptions, std::vector<float>());
         auto options = dataOptions.options();
 
-        int numValues = _dimensions.x*_dimensions.y*_dimensions.z;
+        int numValues = static_cast<int>(_dimensions.x * _dimensions.y * _dimensions.z);
 
         float* values;
         float value;
@@ -120,23 +121,23 @@ std::vector<float*> DataProcessorKameleon::processData(std::string path,
 }
 
 std::vector<float*> DataProcessorKameleon::processData(std::string path,
-                                               properties::SelectionProperty& dataOptions,
+                                               properties::SelectionProperty& optionProp,
                                                glm::size3_t& dimensions)
 {
-    int numOptions =  dataOptions.options().size();
+    int numOptions = static_cast<int>(optionProp.options().size());
 
     if (!path.empty()) {
         if (path != _kwPath || !_kw) {
             initializeKameleonWrapper(path);
         }
 
-        std::vector<int> selectedOptions = dataOptions.value();
+        std::vector<int> selectedOptions = optionProp.value();
 //        int numSelected = selectedOptions.size();
 
-        auto options = dataOptions.options();
-        int numOptions = options.size();
+        const std::vector<properties::SelectionProperty::Option>& options =
+            optionProp.options();
 
-        int numValues = dimensions.x*dimensions.y*dimensions.z;
+        int numValues = static_cast<int>(glm::compMul(dimensions));
 
         float value;
 
@@ -148,7 +149,7 @@ std::vector<float*> DataProcessorKameleon::processData(std::string path,
                 _slice
             );
 
-            for (int i=0; i<numValues; i++) {
+            for (int i = 0; i < numValues; i++) {
                 value = dataOptions[option][i];
                 dataOptions[option][i] = processDataPoint(value, option);
             }
diff --git a/modules/iswa/util/dataprocessortext.cpp b/modules/iswa/util/dataprocessortext.cpp
index a9e584a0f5..11a35bc2e5 100644
--- a/modules/iswa/util/dataprocessortext.cpp
+++ b/modules/iswa/util/dataprocessortext.cpp
@@ -91,7 +91,7 @@ std::vector<std::string> DataProcessorText::readMetadata(std::string data,
 void DataProcessorText::addDataValues(std::string data,
                                       properties::SelectionProperty& dataOptions)
 {
-    int numOptions = dataOptions.options().size();
+    int numOptions = static_cast<int>(dataOptions.options().size());
     initializeVectors(numOptions);
 
     if (!data.empty()) {
@@ -147,16 +147,16 @@ void DataProcessorText::addDataValues(std::string data,
 }
 
 std::vector<float*> DataProcessorText::processData(std::string data,
-                                               properties::SelectionProperty& dataOptions,
+                                               properties::SelectionProperty& options,
                                                glm::size3_t& dimensions)
 {
     if (!data.empty()) {
         std::string line;
         std::stringstream memorystream(data);
 
-        std::vector<int> selectedOptions = dataOptions.value();
+        std::vector<int> selectedOptions = options.value();
 //        int numSelected = selectedOptions.size();
-        int numOptions  = dataOptions.options().size();
+        int numOptions = static_cast<int>(options.options().size());
 
         std::vector<float> values;
         float value;
@@ -164,8 +164,8 @@ std::vector<float*> DataProcessorText::processData(std::string data,
         int first, last, option, lineSize;
 
         std::vector<float*> dataOptions(numOptions, nullptr);
-        for (int option : selectedOptions) {
-            dataOptions[option] = new float[dimensions.x*dimensions.y]{0.0f};
+        for (int o : selectedOptions) {
+            dataOptions[o] = new float[dimensions.x * dimensions.y] { 0.f };
         }
 
         int numValues = 0;
@@ -203,12 +203,11 @@ std::vector<float*> DataProcessorText::processData(std::string data,
 //            first = 0;
             last = 0;
             option = -3;
-            lineSize = line.size();
+            lineSize = static_cast<int>(line.size());
 
             while (last < lineSize) {
-
-                first = line.find_first_not_of(" \t", last);
-                last =  line.find_first_of(" \t", first);
+                first = static_cast<int>(line.find_first_not_of(" \t", last));
+                last = static_cast<int>(line.find_first_of(" \t", first));
                 last = (last > 0)? last : lineSize;
 
                 auto it = std::find(
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index 253870f426..415bf6f865 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -412,8 +412,8 @@ float* KameleonWrapper::getUniformSliceValues(const std::string& var,
     LDEBUG(var << "Min: " << varMin);
     LDEBUG(var << "Max: " << varMax);
 
-    double maxValue = 0.0;
-    double minValue = std::numeric_limits<double>::max();
+    //double maxValue = 0.0;
+    //double minValue = std::numeric_limits<double>::max();
 
     float missingValue = _model->getMissingValue();
 
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index 7a620f6073..98623b0a98 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -394,8 +394,8 @@ void RenderableKameleonVolume::loadCdf(const std::string& path) {
     KameleonVolumeReader reader(path);
 
     if (_autoValueBounds) {
-        _lowerValueBound = reader.minValue(_variable);
-        _upperValueBound = reader.maxValue(_variable);
+        _lowerValueBound = static_cast<float>(reader.minValue(_variable));
+        _upperValueBound = static_cast<float>(reader.maxValue(_variable));
     }
 
     std::vector<std::string> variables = reader.gridVariableNames();
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
index 5a8a135df9..7bd9e672a2 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
@@ -130,8 +130,14 @@ void KameleonVolumeToRawTask::perform(const Task::ProgressCallback& progressCall
     outputMetadata.setValue<glm::vec3>(KeyDimensions, _dimensions);
     outputMetadata.setValue<glm::vec3>(KeyLowerDomainBound, _lowerDomainBound);
     outputMetadata.setValue<glm::vec3>(KeyUpperDomainBound, _upperDomainBound);
-    outputMetadata.setValue<float>(KeyMinValue, reader.minValue(_variable));
-    outputMetadata.setValue<float>(KeyMaxValue, reader.maxValue(_variable));
+    outputMetadata.setValue<float>(
+        KeyMinValue,
+        static_cast<float>(reader.minValue(_variable))
+    );
+    outputMetadata.setValue<float>(
+        KeyMaxValue,
+        static_cast<float>(reader.maxValue(_variable))
+    );
 
     ghoul::DictionaryLuaFormatter formatter;
     std::string metadataString = formatter.format(outputMetadata);
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
index a524ac362c..20244b7ad6 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
@@ -511,7 +511,8 @@ bool RenderableMultiresVolume::initializeSelector() {
                 } else {
                     // Build histograms from tsp file.
                     LWARNING("Failed to open " << cacheFilename);
-                    if (success &= _errorHistogramManager->buildHistograms(nHistograms)) {
+                    success &= _errorHistogramManager->buildHistograms(nHistograms);
+                    if (success) {
                         LINFO("Writing cache to " << cacheFilename);
                         _errorHistogramManager->saveToFile(cacheFilename);
                     }
@@ -537,7 +538,11 @@ bool RenderableMultiresVolume::initializeSelector() {
                 } else {
                     // Build histograms from tsp file.
                     LWARNING("Failed to open " << cacheFilename);
-                    if (success &= _histogramManager->buildHistograms(_tsp.get(), nHistograms)) {
+                    success &= _histogramManager->buildHistograms(
+                        _tsp.get(),
+                        nHistograms
+                    );
+                    if (success) {
                         LINFO("Writing cache to " << cacheFilename);
                         _histogramManager->saveToFile(cacheFilename);
                     }
@@ -563,7 +568,8 @@ bool RenderableMultiresVolume::initializeSelector() {
                 } else {
                     // Build histograms from tsp file.
                     LWARNING("Failed to open " << cacheFilename);
-                    if (success &= _localErrorHistogramManager->buildHistograms(nHistograms)) {
+                    success &= _localErrorHistogramManager->buildHistograms(nHistograms);
+                    if (success) {
                         LINFO("Writing cache to " << cacheFilename);
                         _localErrorHistogramManager->saveToFile(cacheFilename);
                     }
@@ -676,7 +682,7 @@ void RenderableMultiresVolume::update(const UpdateData& data) {
     }
     else if (_useGlobalTime) {
         double t = (_time - _startTime) / (_endTime - _startTime);
-        currentTimestep = t * numTimesteps;
+        currentTimestep = static_cast<int>(t * numTimesteps);
         visible = currentTimestep >= 0 && currentTimestep < numTimesteps;
     }
     else {
diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp
index bcda496340..17287d7e3b 100644
--- a/modules/touch/src/touchinteraction.cpp
+++ b/modules/touch/src/touchinteraction.cpp
@@ -360,7 +360,6 @@ void TouchInteraction::directControl(const std::vector<TuioCursor>& list) {
         dvec3 centerPos = ptr->node->worldPosition();
 
         dvec3 directionToCenter = normalize(centerPos - camPos);
-        dvec3 centerToCamera = camPos - centerPos;
         dvec3 lookUp = ptr->camera->lookUpVectorWorldSpace();
         dvec3 camDirection = ptr->camera->viewDirectionWorldSpace();
 
@@ -386,6 +385,8 @@ void TouchInteraction::directControl(const std::vector<TuioCursor>& list) {
         { // Orbit (global rotation)
             dvec3 eulerAngles(q[1], q[0], 0);
             dquat rotationDiffCamSpace = dquat(eulerAngles);
+            
+            dvec3 centerToCamera = camPos - centerPos;
 
             dquat rotationDiffWorldSpace =
                 globalCamRot * rotationDiffCamSpace * inverse(globalCamRot);
@@ -393,11 +394,11 @@ void TouchInteraction::directControl(const std::vector<TuioCursor>& list) {
                 centerToCamera * rotationDiffWorldSpace - centerToCamera;
             camPos += rotationDiffVec3;
 
-            dvec3 centerToCamera = camPos - centerPos;
+            centerToCamera = camPos - centerPos;
             directionToCenter = normalize(-centerToCamera);
             dvec3 lookUpWhenFacingCenter =
                 globalCamRot * dvec3(ptr->camera->lookUpVectorCameraSpace());
-            dmat4 lookAtMat = lookAt(
+            lookAtMat = lookAt(
                 dvec3(0, 0, 0),
                 directionToCenter,
                 lookUpWhenFacingCenter);
@@ -757,12 +758,12 @@ int TouchInteraction::interpretInteraction(const std::vector<TuioCursor>& list,
     double minDiff = 1000;
     int id = 0;
     for (const TuioCursor& c : list) {
-        TuioPoint point = std::find_if(
+        TuioPoint itPoint = std::find_if(
             lastProcessed.begin(),
             lastProcessed.end(),
             [&c](const Point& p) { return p.first == c.getSessionID(); }
         )->second;
-        double diff = c.getX() - point.getX() + c.getY() - point.getY();
+        double diff = c.getX() - itPoint.getX() + c.getY() - itPoint.getY();
         if (!c.isMoving()) {
             diff = minDiff = 0.0;
             id = c.getSessionID();
@@ -784,8 +785,14 @@ int TouchInteraction::interpretInteraction(const std::vector<TuioCursor>& list,
                 [&c](const Point& p) { return p.first == c.getSessionID(); }
             )->second;
             double res = 0.0;
-            float lastAngle = point.getAngle(_centroid.x, _centroid.y);
-            float currentAngle = c.getAngle(_centroid.x, _centroid.y);
+            float lastAngle = point.getAngle(
+                static_cast<float>(_centroid.x),
+                static_cast<float>(_centroid.y)
+            );
+            float currentAngle = c.getAngle(
+                static_cast<float>(_centroid.x),
+                static_cast<float>(_centroid.y)
+            );
             if (lastAngle > currentAngle + 1.5 * M_PI) {
                 res = currentAngle + (2 * M_PI - lastAngle);
             }
@@ -811,7 +818,9 @@ int TouchInteraction::interpretInteraction(const std::vector<TuioCursor>& list,
         return ROT;
     }
     else {
-        float avgDistance = std::abs(dist - lastDist) / list.at(0).getMotionSpeed();
+        float avgDistance = static_cast<float>(
+            std::abs(dist - lastDist) / list.at(0).getMotionSpeed()
+        );
         // if average distance between 3 fingers are constant we have panning
         if (avgDistance < _interpretPan && list.size() == 3) {
             return PAN;
@@ -854,7 +863,10 @@ void TouchInteraction::computeVelocities(const std::vector<TuioCursor>& list,
                 list.end(),
                 0.0,
                 [&](double d, const TuioCursor& c) {
-                    return d + c.getDistance(_centroid.x, _centroid.y);
+                    return d + c.getDistance(
+                        static_cast<float>(_centroid.x),
+                        static_cast<float>(_centroid.y)
+                    );
                 }
             ) / list.size();
             double lastDistance = std::accumulate(
@@ -862,7 +874,10 @@ void TouchInteraction::computeVelocities(const std::vector<TuioCursor>& list,
                 lastProcessed.end(),
                 0.0f,
                 [&](float d, const Point& p) {
-                    return d + p.second.getDistance(_centroid.x, _centroid.y);
+                    return d + p.second.getDistance(
+                        static_cast<float>(_centroid.x),
+                        static_cast<float>(_centroid.y)
+                    );
                 }
             ) / lastProcessed.size();
 
@@ -886,8 +901,14 @@ void TouchInteraction::computeVelocities(const std::vector<TuioCursor>& list,
                         [&c](const Point& p) { return p.first == c.getSessionID(); }
                     )->second;
                     double res = diff;
-                    double lastAngle = point.getAngle(_centroid.x, _centroid.y);
-                    double currentAngle = c.getAngle(_centroid.x, _centroid.y);
+                    double lastAngle = point.getAngle(
+                        static_cast<float>(_centroid.x),
+                        static_cast<float>(_centroid.y)
+                    );
+                    double currentAngle = c.getAngle(
+                        static_cast<float>(_centroid.x),
+                        static_cast<float>(_centroid.y)
+                    );
                     // if's used to set angles 359 + 1 = 0 and 0 - 1 = 359
                     if (lastAngle > currentAngle + 1.5 * M_PI) {
                         res += currentAngle + (2 * M_PI - lastAngle);
@@ -1009,8 +1030,8 @@ void TouchInteraction::step(double dt) {
                                      centerToCamera;
             camPos += rotationDiffVec3;
 
-            dvec3 centerToCamera = camPos - centerPos;
-            directionToCenter = normalize(-centerToCamera);
+            dvec3 centerToCam = camPos - centerPos;
+            directionToCenter = normalize(-centerToCam);
             dvec3 lookUpWhenFacingCenter = globalCamRot *
                                            dvec3(_camera->lookUpVectorCameraSpace());
             dmat4 lookAtMat = lookAt(
@@ -1021,11 +1042,11 @@ void TouchInteraction::step(double dt) {
         }
         { // Zooming
             centerToBoundingSphere = -directionToCenter * boundingSphere;
-            dvec3 centerToCamera = camPos - centerPos;
-            double distToSurface = length(centerToCamera - centerToBoundingSphere);
+            dvec3 centerToCam = camPos - centerPos;
+            double distToSurface = length(centerToCam - centerToBoundingSphere);
 
             if (length(_vel.zoom * dt) < distToSurface &&
-                length(centerToCamera + directionToCenter*_vel.zoom * dt) >
+                length(centerToCam + directionToCenter*_vel.zoom * dt) >
                     length(centerToBoundingSphere))
             {
                 camPos += directionToCenter * _vel.zoom * dt;
@@ -1054,12 +1075,12 @@ void TouchInteraction::unitTest() {
 
         // set _selected pos and new pos (on screen)
         std::vector<TuioCursor> lastFrame = {
-            { TuioCursor(0, 10, 0.45, 0.4) }, // session id, cursor id, x, y
-            { TuioCursor(1, 11, 0.55, 0.6) }
+            { TuioCursor(0, 10, 0.45f, 0.4f) }, // session id, cursor id, x, y
+            { TuioCursor(1, 11, 0.55f, 0.6f) }
         };
         std::vector<TuioCursor> currFrame = {
-            { TuioCursor(0, 10, 0.2, 0.6) }, // (-0.6,-0.2)
-            { TuioCursor(1, 11, 0.8, 0.4) } // (0.6, 0.2)
+            { TuioCursor(0, 10, 0.2f, 0.6f) }, // (-0.6,-0.2)
+            { TuioCursor(1, 11, 0.8f, 0.4f) } // (0.6, 0.2)
         };
 
         // call update
@@ -1098,7 +1119,7 @@ void TouchInteraction::decelerate(double dt) {
     double frequency = 1.0 / _deceleratesPerSecond;
     // Number of times velocities should decelerate, depending on chosen frequency and
     // time slack over from last frame
-    int times = (dt + _timeSlack) / frequency;
+    int times = static_cast<int>((dt + _timeSlack) / frequency);
     // Save the new time slack for the next frame
     _timeSlack = fmod((dt + _timeSlack), frequency);
 
diff --git a/modules/volume/rawvolumewriter.inl b/modules/volume/rawvolumewriter.inl
index cad5fcfa1c..d67b222767 100644
--- a/modules/volume/rawvolumewriter.inl
+++ b/modules/volume/rawvolumewriter.inl
@@ -68,7 +68,7 @@ void RawVolumeWriter<VoxelType>::write(
     std::vector<VoxelType> buffer(_bufferSize);
     std::ofstream file(_path, std::ios::binary);
 
-    int nChunks = size / _bufferSize;
+    int nChunks = static_cast<int>(size / _bufferSize);
     if (size % _bufferSize > 0) {
         nChunks++;
     }
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index 8367795557..3374f038fd 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -157,20 +157,20 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
                                                       const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _clipPlanes(nullptr)
-    , _stepSize(StepSizeInfo, 0.02, 0.01, 1)
+    , _stepSize(StepSizeInfo, 0.02f, 0.01f, 1.f)
     , _gridType(GridTypeInfo, properties::OptionProperty::DisplayType::Dropdown)
-    , _secondsBefore(SecondsBeforeInfo, 0.0, 0.01, SecondsInOneDay)
-    , _secondsAfter(SecondsAfterInfo, 0.0, 0.01, SecondsInOneDay)
+    , _secondsBefore(SecondsBeforeInfo, 0.f, 0.01f, SecondsInOneDay)
+    , _secondsAfter(SecondsAfterInfo, 0.f, 0.01f, SecondsInOneDay)
     , _sourceDirectory(SourceDirectoryInfo)
     , _transferFunctionPath(TransferFunctionInfo)
     , _triggerTimeJump(TriggerTimeJumpInfo)
     , _jumpToTimestep(JumpToTimestepInfo, 0, 0, 256)
     , _currentTimestep(CurrentTimeStepInfo, 0, 0, 256)
-    , _opacity(OpacityInfo, 10.0f, 0.0f, 50.0f)
-    , _rNormalization(rNormalizationInfo, 0.0f, 0.0f, 2.0f)
-    , _rUpperBound(rUpperBoundInfo, 1.0f, 0.0f, 2.0f)
-    , _lowerValueBound(lowerValueBoundInfo, 0.0f, 0.0f, 1000000.0f)
-    , _upperValueBound(upperValueBoundInfo, 0.0f, 0.0f, 1000000.0f)
+    , _opacity(OpacityInfo, 10.f, 0.f, 50.f)
+    , _rNormalization(rNormalizationInfo, 0.f, 0.f, 2.f)
+    , _rUpperBound(rUpperBoundInfo, 1.f, 0.f, 2.f)
+    , _lowerValueBound(lowerValueBoundInfo, 0.f, 0.f, 1000000.f)
+    , _upperValueBound(upperValueBoundInfo, 0.f, 0.f, 1000000.f)
     , _raycaster(nullptr)
     , _transferFunction(nullptr)
 {
@@ -296,7 +296,7 @@ void RenderableTimeVaryingVolume::initializeGL() {
     });
 
     const int lastTimestep = (_volumeTimesteps.size() > 0) ?
-                             (_volumeTimesteps.size() - 1) :
+                             static_cast<int>(_volumeTimesteps.size() - 1) :
                              0;
     _currentTimestep.setMaxValue(lastTimestep);
     _jumpToTimestep.setMaxValue(lastTimestep);
@@ -425,7 +425,7 @@ void RenderableTimeVaryingVolume::jumpToTimestep(int target) {
     OsEng.timeManager().setTimeNextFrame(t->time);
 }
 
-void RenderableTimeVaryingVolume::update(const UpdateData& data) {
+void RenderableTimeVaryingVolume::update(const UpdateData&) {
     if (_raycaster) {
         Timestep* t = currentTimestep();
         _currentTimestep = timestepIndex(t);
diff --git a/modules/volume/textureslicevolumereader.h b/modules/volume/textureslicevolumereader.h
index 4c9af06ff8..89172a7f8b 100644
--- a/modules/volume/textureslicevolumereader.h
+++ b/modules/volume/textureslicevolumereader.h
@@ -43,6 +43,8 @@ public:
 
     TextureSliceVolumeReader(std::vector<std::string> paths, size_t sliceCacheMaxItems,
         size_t sliceCacheSize);
+    virtual ~TextureSliceVolumeReader() = default;
+
     VoxelType get(const glm::ivec3& coordinates) const;
     virtual glm::ivec3 dimensions() const;
     void setPaths(const std::vector<std::string> paths);
diff --git a/modules/volume/volumesampler.inl b/modules/volume/volumesampler.inl
index 9f7a26d8be..d62dcaedfd 100644
--- a/modules/volume/volumesampler.inl
+++ b/modules/volume/volumesampler.inl
@@ -56,20 +56,20 @@ typename VolumeType::VoxelType VolumeSampler<VolumeType>::sample(
         for (int y = minCoords.y; y <= maxCoords.y; y++) {
             for (int x = minCoords.x; x <= maxCoords.x; x++) {
                 glm::ivec3 sampleCoords = glm::ivec3(x, y, z);
-                float filterCoefficient = 1.0;
+                float filterCoefficient = 1.f;
 
                 if (x == minCoords.x) {
-                    filterCoefficient *= (1.0 - t.x);
+                    filterCoefficient *= (1.f - t.x);
                 } else if (x == maxCoords.x) {
                     filterCoefficient *= t.x;
                 }
                 if (y == minCoords.y) {
-                    filterCoefficient *= (1.0 - t.y);
+                    filterCoefficient *= (1.f - t.y);
                 } else if (y == maxCoords.y) {
                     filterCoefficient *= t.y;
                 }
                 if (z == minCoords.z) {
-                    filterCoefficient *= (1.0 - t.z);
+                    filterCoefficient *= (1.f - t.z);
                 } else if (z == maxCoords.z) {
                     filterCoefficient *= t.z;
                 }
diff --git a/src/interaction/touchbar.mm b/src/interaction/touchbar.mm
index 835ce52e9c..6cfd74fa15 100644
--- a/src/interaction/touchbar.mm
+++ b/src/interaction/touchbar.mm
@@ -75,6 +75,8 @@ NSArray* focusIdentifiers;
     - (NSTouchBarItem *)touchBar:(NSTouchBar *)touchBar
                         makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier
     {
+        (void)touchBar;
+
         if ([identifier isEqualToString:pauseResultId]) {
             NSButton* button = [NSButton 
                 buttonWithTitle:NSLocalizedString(
@@ -144,13 +146,13 @@ NSArray* focusIdentifiers;
             openspace::scripting::ScriptEngine::RemoteScripting::Yes
         );
 
-        NSButton* button = (NSButton*)sender;
+        NSButton* button = static_cast<NSButton*>(sender);
         // This check is inverted since the togglePause script has not run yet
         [button setTitle: OsEng.timeManager().time().paused() ? @"Pause" : @"Resume"];
     }
 
     - (void)focusObjectAction:(id)sender {
-        NSButton* button = (NSButton*)sender;
+        NSButton* button = static_cast<NSButton*>(sender);
 
         NSString* title = [button title];
 
@@ -162,6 +164,7 @@ NSArray* focusIdentifiers;
     }
 
     - (void)guiButtonAction:(id)sender {
+        (void)sender;
         OsEng.scriptEngine().queueScript(
             "openspace.setPropertyValue('Global Properties.ImGUI.Main.Enabled', \
             not openspace.getPropertyValue('Global Properties.ImGUI.Main.Enabled'));",
diff --git a/src/properties/matrix/dmat2property.cpp b/src/properties/matrix/dmat2property.cpp
index b342547cf8..203c59992d 100644
--- a/src/properties/matrix/dmat2property.cpp
+++ b/src/properties/matrix/dmat2property.cpp
@@ -45,8 +45,7 @@ namespace openspace::properties {
                     success = false;                                                     \
                     return __TYPE__(0);                                                  \
                 } else {                                                                 \
-                    result[i][j]                                                         \
-                          = static_cast<__TYPE__::value_type>(lua_tonumber(state, -1));  \
+                    result[i][j] = lua_tonumber(state, -1);                             \
                     lua_pop(state, 1);                                                   \
                     ++number;                                                            \
                 }                                                                        \
@@ -62,7 +61,7 @@ namespace openspace::properties {
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_cols<__TYPE__>::value; ++i) {           \
             for (glm::length_t j = 0; j < ghoul::glm_rows<__TYPE__>::value; ++j) {       \
-                lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));             \
+                lua_pushnumber(state, value[i][j]);                                      \
                 lua_setfield(state, -2, std::to_string(number).c_str());                 \
                 ++number;                                                                \
             }                                                                            \
@@ -71,9 +70,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/dmat2x3property.cpp b/src/properties/matrix/dmat2x3property.cpp
index 95ea2ace90..f6f7e72564 100644
--- a/src/properties/matrix/dmat2x3property.cpp
+++ b/src/properties/matrix/dmat2x3property.cpp
@@ -45,8 +45,7 @@ namespace openspace::properties {
                     success = false;                                                     \
                     return __TYPE__(0);                                                  \
                 } else {                                                                 \
-                    result[i][j]                                                         \
-                          = static_cast<__TYPE__::value_type>(lua_tonumber(state, -1));  \
+                    result[i][j] = lua_tonumber(state, -1);                              \
                     lua_pop(state, 1);                                                   \
                     ++number;                                                            \
                 }                                                                        \
@@ -62,7 +61,7 @@ namespace openspace::properties {
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_cols<__TYPE__>::value; ++i) {           \
             for (glm::length_t j = 0; j < ghoul::glm_rows<__TYPE__>::value; ++j) {       \
-                lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));             \
+                lua_pushnumber(state, value[i][j]);                                      \
                 lua_setfield(state, -2, std::to_string(number).c_str());                 \
                 ++number;                                                                \
             }                                                                            \
@@ -71,9 +70,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/dmat2x4property.cpp b/src/properties/matrix/dmat2x4property.cpp
index 3d65c79819..aef0f34943 100644
--- a/src/properties/matrix/dmat2x4property.cpp
+++ b/src/properties/matrix/dmat2x4property.cpp
@@ -45,8 +45,7 @@ namespace openspace::properties {
                     success = false;                                                     \
                     return __TYPE__(0);                                                  \
                 } else {                                                                 \
-                    result[i][j]                                                         \
-                          = static_cast<__TYPE__::value_type>(lua_tonumber(state, -1));  \
+                    result[i][j] = lua_tonumber(state, -1);                              \
                     lua_pop(state, 1);                                                   \
                     ++number;                                                            \
                 }                                                                        \
@@ -62,7 +61,7 @@ namespace openspace::properties {
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_cols<__TYPE__>::value; ++i) {           \
             for (glm::length_t j = 0; j < ghoul::glm_rows<__TYPE__>::value; ++j) {       \
-                lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));             \
+                lua_pushnumber(state, value[i][j]);                                      \
                 lua_setfield(state, -2, std::to_string(number).c_str());                 \
                 ++number;                                                                \
             }                                                                            \
@@ -71,9 +70,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/dmat3property.cpp b/src/properties/matrix/dmat3property.cpp
index adb7445b2e..f89a6921cb 100644
--- a/src/properties/matrix/dmat3property.cpp
+++ b/src/properties/matrix/dmat3property.cpp
@@ -45,8 +45,7 @@ namespace openspace::properties {
                     success = false;                                                     \
                     return __TYPE__(0);                                                  \
                 } else {                                                                 \
-                    result[i][j]                                                         \
-                          = static_cast<__TYPE__::value_type>(lua_tonumber(state, -1));  \
+                    result[i][j] = lua_tonumber(state, -1);                              \
                     lua_pop(state, 1);                                                   \
                     ++number;                                                            \
                 }                                                                        \
@@ -62,7 +61,7 @@ namespace openspace::properties {
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_cols<__TYPE__>::value; ++i) {           \
             for (glm::length_t j = 0; j < ghoul::glm_rows<__TYPE__>::value; ++j) {       \
-                lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));             \
+                lua_pushnumber(state, value[i][j]);                                      \
                 lua_setfield(state, -2, std::to_string(number).c_str());                 \
                 ++number;                                                                \
             }                                                                            \
@@ -71,9 +70,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/dmat3x2property.cpp b/src/properties/matrix/dmat3x2property.cpp
index d5e4efb0f7..8ce1041e5b 100644
--- a/src/properties/matrix/dmat3x2property.cpp
+++ b/src/properties/matrix/dmat3x2property.cpp
@@ -45,8 +45,7 @@ namespace openspace::properties {
                     success = false;                                                     \
                     return __TYPE__(0);                                                  \
                 } else {                                                                 \
-                    result[i][j]                                                         \
-                          = static_cast<__TYPE__::value_type>(lua_tonumber(state, -1));  \
+                    result[i][j] = lua_tonumber(state, -1);                              \
                     lua_pop(state, 1);                                                   \
                     ++number;                                                            \
                 }                                                                        \
@@ -62,7 +61,7 @@ namespace openspace::properties {
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_cols<__TYPE__>::value; ++i) {           \
             for (glm::length_t j = 0; j < ghoul::glm_rows<__TYPE__>::value; ++j) {       \
-                lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));             \
+                lua_pushnumber(state, value[i][j]);                                      \
                 lua_setfield(state, -2, std::to_string(number).c_str());                 \
                 ++number;                                                                \
             }                                                                            \
@@ -71,9 +70,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/dmat3x4property.cpp b/src/properties/matrix/dmat3x4property.cpp
index dbb2e309c1..db6ef6f8cc 100644
--- a/src/properties/matrix/dmat3x4property.cpp
+++ b/src/properties/matrix/dmat3x4property.cpp
@@ -45,8 +45,7 @@ namespace openspace::properties {
                     success = false;                                                     \
                     return __TYPE__(0);                                                  \
                 } else {                                                                 \
-                    result[i][j]                                                         \
-                          = static_cast<__TYPE__::value_type>(lua_tonumber(state, -1));  \
+                    result[i][j] = lua_tonumber(state, -1);                              \
                     lua_pop(state, 1);                                                   \
                     ++number;                                                            \
                 }                                                                        \
@@ -62,7 +61,7 @@ namespace openspace::properties {
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_cols<__TYPE__>::value; ++i) {           \
             for (glm::length_t j = 0; j < ghoul::glm_rows<__TYPE__>::value; ++j) {       \
-                lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));             \
+                lua_pushnumber(state, value[i][j]);                                      \
                 lua_setfield(state, -2, std::to_string(number).c_str());                 \
                 ++number;                                                                \
             }                                                                            \
@@ -71,9 +70,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/dmat4property.cpp b/src/properties/matrix/dmat4property.cpp
index d24094ef55..f0836cdd47 100644
--- a/src/properties/matrix/dmat4property.cpp
+++ b/src/properties/matrix/dmat4property.cpp
@@ -45,8 +45,7 @@ namespace openspace::properties {
                     success = false;                                                     \
                     return __TYPE__(0);                                                  \
                 } else {                                                                 \
-                    result[i][j]                                                         \
-                          = static_cast<__TYPE__::value_type>(lua_tonumber(state, -1));  \
+                    result[i][j] = lua_tonumber(state, -1);                              \
                     lua_pop(state, 1);                                                   \
                     ++number;                                                            \
                 }                                                                        \
@@ -62,7 +61,7 @@ namespace openspace::properties {
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_cols<__TYPE__>::value; ++i) {           \
             for (glm::length_t j = 0; j < ghoul::glm_rows<__TYPE__>::value; ++j) {       \
-                lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));             \
+                lua_pushnumber(state, value[i][j]);                                      \
                 lua_setfield(state, -2, std::to_string(number).c_str());                 \
                 ++number;                                                                \
             }                                                                            \
@@ -71,9 +70,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/dmat4x2property.cpp b/src/properties/matrix/dmat4x2property.cpp
index c7ac0bdbce..42383dc7e5 100644
--- a/src/properties/matrix/dmat4x2property.cpp
+++ b/src/properties/matrix/dmat4x2property.cpp
@@ -45,8 +45,7 @@ namespace openspace::properties {
                     success = false;                                                     \
                     return __TYPE__(0);                                                  \
                 } else {                                                                 \
-                    result[i][j]                                                         \
-                          = static_cast<__TYPE__::value_type>(lua_tonumber(state, -1));  \
+                    result[i][j] = lua_tonumber(state, -1);                              \
                     lua_pop(state, 1);                                                   \
                     ++number;                                                            \
                 }                                                                        \
@@ -62,7 +61,7 @@ namespace openspace::properties {
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_cols<__TYPE__>::value; ++i) {           \
             for (glm::length_t j = 0; j < ghoul::glm_rows<__TYPE__>::value; ++j) {       \
-                lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));             \
+                lua_pushnumber(state, value[i][j]);                                      \
                 lua_setfield(state, -2, std::to_string(number).c_str());                 \
                 ++number;                                                                \
             }                                                                            \
@@ -71,9 +70,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/dmat4x3property.cpp b/src/properties/matrix/dmat4x3property.cpp
index 20cd44d31f..2799b48246 100644
--- a/src/properties/matrix/dmat4x3property.cpp
+++ b/src/properties/matrix/dmat4x3property.cpp
@@ -45,8 +45,7 @@ namespace openspace::properties {
                     success = false;                                                     \
                     return __TYPE__(0);                                                  \
                 } else {                                                                 \
-                    result[i][j]                                                         \
-                          = static_cast<__TYPE__::value_type>(lua_tonumber(state, -1));  \
+                    result[i][j] = lua_tonumber(state, -1);                             \
                     lua_pop(state, 1);                                                   \
                     ++number;                                                            \
                 }                                                                        \
@@ -62,7 +61,7 @@ namespace openspace::properties {
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_cols<__TYPE__>::value; ++i) {           \
             for (glm::length_t j = 0; j < ghoul::glm_rows<__TYPE__>::value; ++j) {       \
-                lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));             \
+                lua_pushnumber(state, value[i][j]);                                      \
                 lua_setfield(state, -2, std::to_string(number).c_str());                 \
                 ++number;                                                                \
             }                                                                            \
@@ -71,9 +70,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/mat2property.cpp b/src/properties/matrix/mat2property.cpp
index 90870a3acc..0e9fdf6e17 100644
--- a/src/properties/matrix/mat2property.cpp
+++ b/src/properties/matrix/mat2property.cpp
@@ -71,9 +71,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/mat2x3property.cpp b/src/properties/matrix/mat2x3property.cpp
index 5c50c6f762..bc3af9fea3 100644
--- a/src/properties/matrix/mat2x3property.cpp
+++ b/src/properties/matrix/mat2x3property.cpp
@@ -71,9 +71,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/mat2x4property.cpp b/src/properties/matrix/mat2x4property.cpp
index 7732916f79..0ed2f13216 100644
--- a/src/properties/matrix/mat2x4property.cpp
+++ b/src/properties/matrix/mat2x4property.cpp
@@ -71,9 +71,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/mat3property.cpp b/src/properties/matrix/mat3property.cpp
index 9f29b6e17f..833e04090f 100644
--- a/src/properties/matrix/mat3property.cpp
+++ b/src/properties/matrix/mat3property.cpp
@@ -71,9 +71,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/mat3x2property.cpp b/src/properties/matrix/mat3x2property.cpp
index da77825b01..5b406c49e7 100644
--- a/src/properties/matrix/mat3x2property.cpp
+++ b/src/properties/matrix/mat3x2property.cpp
@@ -71,9 +71,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/mat3x4property.cpp b/src/properties/matrix/mat3x4property.cpp
index 75e5de60b9..e097be5d61 100644
--- a/src/properties/matrix/mat3x4property.cpp
+++ b/src/properties/matrix/mat3x4property.cpp
@@ -71,9 +71,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/mat4property.cpp b/src/properties/matrix/mat4property.cpp
index f22df74bd3..7a9850a8d2 100644
--- a/src/properties/matrix/mat4property.cpp
+++ b/src/properties/matrix/mat4property.cpp
@@ -71,9 +71,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/mat4x2property.cpp b/src/properties/matrix/mat4x2property.cpp
index 646a70d288..f8e2b2979f 100644
--- a/src/properties/matrix/mat4x2property.cpp
+++ b/src/properties/matrix/mat4x2property.cpp
@@ -71,9 +71,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/matrix/mat4x3property.cpp b/src/properties/matrix/mat4x3property.cpp
index 4ecd920a22..c2041ee21a 100644
--- a/src/properties/matrix/mat4x3property.cpp
+++ b/src/properties/matrix/mat4x3property.cpp
@@ -71,9 +71,9 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_FROM_STRING_LAMBDA(__TYPE__)                                             \
-    [](std::string v, bool& success) -> __TYPE__ {                                       \
+    [](std::string val, bool& success) -> __TYPE__ {                                     \
         __TYPE__ result;                                                                 \
-        std::vector<std::string> tokens = ghoul::tokenizeString(v, ',');                 \
+        std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');               \
         if (tokens.size() !=                                                             \
             (ghoul::glm_rows<__TYPE__>::value * ghoul::glm_cols<__TYPE__>::value))       \
         {                                                                                \
diff --git a/src/properties/scalar/boolproperty.cpp b/src/properties/scalar/boolproperty.cpp
index 704c3cab57..4f4e958a34 100644
--- a/src/properties/scalar/boolproperty.cpp
+++ b/src/properties/scalar/boolproperty.cpp
@@ -45,8 +45,8 @@ REGISTER_TEMPLATEPROPERTY_SOURCE(BoolProperty, bool, false,
         lua_pushboolean(state, value);
         return true;
     },
-    [](std::string value, bool& success) -> bool {
-        std::stringstream s(value);
+    [](std::string val, bool& success) -> bool {
+        std::stringstream s(val);
         bool v;
         s >> v;
         success = !s.fail();
@@ -54,7 +54,7 @@ REGISTER_TEMPLATEPROPERTY_SOURCE(BoolProperty, bool, false,
             return v;
         }
         else {
-            throw ghoul::RuntimeError("Conversion error for string: " + value);
+            throw ghoul::RuntimeError("Conversion error for string: " + val);
         }
     },
     [](std::string& outValue, bool inValue) -> bool {
diff --git a/src/properties/scalar/doubleproperty.cpp b/src/properties/scalar/doubleproperty.cpp
index 344fef6262..9a4fb100e1 100644
--- a/src/properties/scalar/doubleproperty.cpp
+++ b/src/properties/scalar/doubleproperty.cpp
@@ -37,7 +37,7 @@ namespace openspace::properties {
     [](lua_State* state, bool& success) -> TYPE {                                        \
         success = (lua_isnumber(state, -1) == 1);                                        \
         if (success) {                                                                   \
-            return static_cast<TYPE>(lua_tonumber(state, -1));                           \
+            return lua_tonumber(state, -1);                                              \
         }                                                                                \
         else {                                                                           \
             return DEFAULT_VALUE;                                                        \
@@ -46,7 +46,7 @@ namespace openspace::properties {
 
 #define DEFAULT_TO_LUA_LAMBDA(TYPE)                                                      \
     [](lua_State* state, TYPE value) -> bool {                                           \
-        lua_pushnumber(state, static_cast<lua_Number>(value));                           \
+        lua_pushnumber(state, value);                                                    \
         return true;                                                                     \
     }
 
diff --git a/src/properties/scalar/intproperty.cpp b/src/properties/scalar/intproperty.cpp
index 18bd6a23fe..a957778952 100644
--- a/src/properties/scalar/intproperty.cpp
+++ b/src/properties/scalar/intproperty.cpp
@@ -70,11 +70,11 @@ namespace openspace::properties {
         return true;                                                                     \
     }
 
-REGISTER_NUMERICALPROPERTY_SOURCE(IntProperty, int, int(0), numeric_limits<int>::lowest(),
-                                  numeric_limits<int>::max(), int(1),
-                                  DEFAULT_FROM_LUA_LAMBDA(int, int(0)),
+REGISTER_NUMERICALPROPERTY_SOURCE(IntProperty, int, 0, numeric_limits<int>::lowest(),
+                                  numeric_limits<int>::max(), 1,
+                                  DEFAULT_FROM_LUA_LAMBDA(int, 0),
                                   DEFAULT_TO_LUA_LAMBDA(int),
-                                  DEFAULT_FROM_STRING_LAMBDA(int, int(0)),
+                                  DEFAULT_FROM_STRING_LAMBDA(int, 0),
                                   DEFAULT_TO_STRING_LAMBDA(int),
                                   LUA_TNUMBER)
 
diff --git a/src/properties/stringproperty.cpp b/src/properties/stringproperty.cpp
index 7278352ef8..ba52ec3c35 100644
--- a/src/properties/stringproperty.cpp
+++ b/src/properties/stringproperty.cpp
@@ -41,21 +41,21 @@ REGISTER_TEMPLATEPROPERTY_SOURCE(
             return "";
         }
     },
-    [](lua_State* state, std::string value) -> bool {
-        lua_pushstring(state, value.c_str());
+    [](lua_State* state, std::string val) -> bool {
+        lua_pushstring(state, val.c_str());
         return true;
     },
-    [](std::string value, bool& success) -> std::string {
+    [](std::string val, bool& success) -> std::string {
         // An incoming string is of the form
         // "value"
         // so we want to remove the leading and trailing " characters
-        if (value.size() > 2 && (value[0] == '"' && value[value.size() - 1] == '"')) {
+        if (val.size() > 2 && (val[0] == '"' && val[val.size() - 1] == '"')) {
             // Removing the first and last "
             success = true;
-            return value.substr(1, value.size() - 2);
+            return val.substr(1, val.size() - 2);
         }
         success = false;
-        return value;
+        return val;
     },
     [](std::string& outValue, std::string inValue) -> bool {
         outValue = "\"" + inValue + "\"";
diff --git a/src/properties/vector/bvec2property.cpp b/src/properties/vector/bvec2property.cpp
index d82d8aea2a..ea5010f73d 100644
--- a/src/properties/vector/bvec2property.cpp
+++ b/src/properties/vector/bvec2property.cpp
@@ -35,7 +35,7 @@ using std::numeric_limits;
 namespace openspace::properties {
 
 #define DEFAULT_FROM_LUA_LAMBDA(__TYPE__, __CONVFUNC__, __TESTFUNC__)                    \
-    [](lua_State * state, bool& success) -> __TYPE__ {                                   \
+    [](lua_State* state, bool& success) -> __TYPE__ {                                    \
         __TYPE__ result;                                                                 \
         lua_pushnil(state);                                                              \
         for (glm::length_t i = 0; i < ghoul::glm_components<__TYPE__>::value; ++i) {     \
@@ -57,11 +57,11 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_TO_LUA_LAMBDA(__TYPE__)                                                  \
-    [](lua_State * state, __TYPE__ value) -> bool {                                      \
+    [](lua_State* state, __TYPE__ val) -> bool {                                         \
         lua_newtable(state);                                                             \
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_components<__TYPE__>::value; ++i) {     \
-            lua_pushnumber(state, static_cast<lua_Number>(value[i]));                    \
+            lua_pushnumber(state, static_cast<lua_Number>(val[i]));                      \
             lua_setfield(state, -2, std::to_string(number).c_str());                     \
             ++number;                                                                    \
         }                                                                                \
diff --git a/src/properties/vector/bvec3property.cpp b/src/properties/vector/bvec3property.cpp
index 8260366516..7cdf10d409 100644
--- a/src/properties/vector/bvec3property.cpp
+++ b/src/properties/vector/bvec3property.cpp
@@ -35,7 +35,7 @@ using std::numeric_limits;
 namespace openspace::properties {
 
 #define DEFAULT_FROM_LUA_LAMBDA(__TYPE__, __CONVFUNC__, __TESTFUNC__)                    \
-    [](lua_State * state, bool& success) -> __TYPE__ {                                   \
+    [](lua_State* state, bool& success) -> __TYPE__ {                                    \
         __TYPE__ result;                                                                 \
         lua_pushnil(state);                                                              \
         for (glm::length_t i = 0; i < ghoul::glm_components<__TYPE__>::value; ++i) {     \
@@ -57,11 +57,11 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_TO_LUA_LAMBDA(__TYPE__)                                                  \
-    [](lua_State * state, __TYPE__ value) -> bool {                                      \
+    [](lua_State* state, __TYPE__ val) -> bool {                                         \
         lua_newtable(state);                                                             \
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_components<__TYPE__>::value; ++i) {     \
-            lua_pushnumber(state, static_cast<lua_Number>(value[i]));                    \
+            lua_pushnumber(state, static_cast<lua_Number>(val[i]));                      \
             lua_setfield(state, -2, std::to_string(number).c_str());                     \
             ++number;                                                                    \
         }                                                                                \
diff --git a/src/properties/vector/bvec4property.cpp b/src/properties/vector/bvec4property.cpp
index 1524d73a7e..c8b2dc0e0d 100644
--- a/src/properties/vector/bvec4property.cpp
+++ b/src/properties/vector/bvec4property.cpp
@@ -35,7 +35,7 @@ using std::numeric_limits;
 namespace openspace::properties {
 
 #define DEFAULT_FROM_LUA_LAMBDA(__TYPE__, __CONVFUNC__, __TESTFUNC__)                    \
-    [](lua_State * state, bool& success) -> __TYPE__ {                                   \
+    [](lua_State*  state, bool& success) -> __TYPE__ {                                   \
         __TYPE__ result;                                                                 \
         lua_pushnil(state);                                                              \
         for (glm::length_t i = 0; i < ghoul::glm_components<__TYPE__>::value; ++i) {     \
@@ -57,11 +57,11 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_TO_LUA_LAMBDA(__TYPE__)                                                  \
-    [](lua_State * state, __TYPE__ value) -> bool {                                      \
+    [](lua_State* state, __TYPE__ val) -> bool {                                         \
         lua_newtable(state);                                                             \
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_components<__TYPE__>::value; ++i) {     \
-            lua_pushnumber(state, static_cast<lua_Number>(value[i]));                    \
+            lua_pushnumber(state, static_cast<lua_Number>(val[i]));                      \
             lua_setfield(state, -2, std::to_string(number).c_str());                     \
             ++number;                                                                    \
         }                                                                                \
diff --git a/src/properties/vector/dvec2property.cpp b/src/properties/vector/dvec2property.cpp
index a09f08bf62..094a38645a 100644
--- a/src/properties/vector/dvec2property.cpp
+++ b/src/properties/vector/dvec2property.cpp
@@ -35,7 +35,7 @@ using std::numeric_limits;
 namespace openspace::properties {
 
 #define DEFAULT_FROM_LUA_LAMBDA(__TYPE__, __CONVFUNC__, __TESTFUNC__)                    \
-    [](lua_State * state, bool& success) -> __TYPE__ {                                   \
+    [](lua_State* state, bool& success) -> __TYPE__ {                                    \
         __TYPE__ result;                                                                 \
         lua_pushnil(state);                                                              \
         for (glm::length_t i = 0; i < ghoul::glm_components<__TYPE__>::value; ++i) {     \
@@ -48,7 +48,7 @@ namespace openspace::properties {
                 success = false;                                                         \
                 return __TYPE__(0);                                                      \
             } else {                                                                     \
-                result[i] = static_cast<__TYPE__::value_type>(__CONVFUNC__(state, -1));  \
+                result[i] = __CONVFUNC__(state, -1);                                     \
                 lua_pop(state, 1);                                                       \
             }                                                                            \
         }                                                                                \
@@ -61,7 +61,7 @@ namespace openspace::properties {
         lua_newtable(state);                                                             \
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_components<__TYPE__>::value; ++i) {     \
-            lua_pushnumber(state, static_cast<lua_Number>(value[i]));                    \
+            lua_pushnumber(state, value[i]);                                             \
             lua_setfield(state, -2, std::to_string(number).c_str());                     \
             ++number;                                                                    \
         }                                                                                \
diff --git a/src/properties/vector/dvec3property.cpp b/src/properties/vector/dvec3property.cpp
index 39876748dc..e6afdc2052 100644
--- a/src/properties/vector/dvec3property.cpp
+++ b/src/properties/vector/dvec3property.cpp
@@ -35,7 +35,7 @@ using std::numeric_limits;
 namespace openspace::properties {
 
 #define DEFAULT_FROM_LUA_LAMBDA(__TYPE__, __CONVFUNC__, __TESTFUNC__)                    \
-    [](lua_State * state, bool& success) -> __TYPE__ {                                   \
+    [](lua_State* state, bool& success) -> __TYPE__ {                                    \
         __TYPE__ result;                                                                 \
         lua_pushnil(state);                                                              \
         for (glm::length_t i = 0; i < ghoul::glm_components<__TYPE__>::value; ++i) {     \
@@ -48,7 +48,7 @@ namespace openspace::properties {
                 success = false;                                                         \
                 return __TYPE__(0);                                                      \
             } else {                                                                     \
-                result[i] = static_cast<__TYPE__::value_type>(__CONVFUNC__(state, -1));  \
+                result[i] = __CONVFUNC__(state, -1);                                     \
                 lua_pop(state, 1);                                                       \
             }                                                                            \
         }                                                                                \
@@ -61,7 +61,7 @@ namespace openspace::properties {
         lua_newtable(state);                                                             \
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_components<__TYPE__>::value; ++i) {     \
-            lua_pushnumber(state, static_cast<lua_Number>(value[i]));                    \
+            lua_pushnumber(state, value[i]);                                             \
             lua_setfield(state, -2, std::to_string(number).c_str());                     \
             ++number;                                                                    \
         }                                                                                \
diff --git a/src/properties/vector/dvec4property.cpp b/src/properties/vector/dvec4property.cpp
index fe1223dc2e..affe3271db 100644
--- a/src/properties/vector/dvec4property.cpp
+++ b/src/properties/vector/dvec4property.cpp
@@ -35,7 +35,7 @@ using std::numeric_limits;
 namespace openspace::properties {
 
 #define DEFAULT_FROM_LUA_LAMBDA(__TYPE__, __CONVFUNC__, __TESTFUNC__)                    \
-    [](lua_State * state, bool& success) -> __TYPE__ {                                   \
+    [](lua_State* state, bool& success) -> __TYPE__ {                                    \
         __TYPE__ result;                                                                 \
         lua_pushnil(state);                                                              \
         for (glm::length_t i = 0; i < ghoul::glm_components<__TYPE__>::value; ++i) {     \
@@ -48,7 +48,7 @@ namespace openspace::properties {
                 success = false;                                                         \
                 return __TYPE__(0);                                                      \
             } else {                                                                     \
-                result[i] = static_cast<__TYPE__::value_type>(__CONVFUNC__(state, -1));  \
+                result[i] = __CONVFUNC__(state, -1);                                     \
                 lua_pop(state, 1);                                                       \
             }                                                                            \
         }                                                                                \
@@ -61,7 +61,7 @@ namespace openspace::properties {
         lua_newtable(state);                                                             \
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_components<__TYPE__>::value; ++i) {     \
-            lua_pushnumber(state, static_cast<lua_Number>(value[i]));                    \
+            lua_pushnumber(state, value[i]);                                             \
             lua_setfield(state, -2, std::to_string(number).c_str());                     \
             ++number;                                                                    \
         }                                                                                \
diff --git a/src/properties/vector/ivec2property.cpp b/src/properties/vector/ivec2property.cpp
index b18f153efe..f39178b3ab 100644
--- a/src/properties/vector/ivec2property.cpp
+++ b/src/properties/vector/ivec2property.cpp
@@ -35,7 +35,7 @@ using std::numeric_limits;
 namespace openspace::properties {
 
 #define DEFAULT_FROM_LUA_LAMBDA(__TYPE__, __CONVFUNC__, __TESTFUNC__)                    \
-    [](lua_State * state, bool& success) -> __TYPE__ {                                   \
+    [](lua_State* state, bool& success) -> __TYPE__ {                                    \
         __TYPE__ result;                                                                 \
         lua_pushnil(state);                                                              \
         for (glm::length_t i = 0; i < ghoul::glm_components<__TYPE__>::value; ++i) {     \
@@ -57,7 +57,7 @@ namespace openspace::properties {
     }
 
 #define DEFAULT_TO_LUA_LAMBDA(__TYPE__)                                                  \
-    [](lua_State * state, __TYPE__ value) -> bool {                                      \
+    [](lua_State* state, __TYPE__ value) -> bool {                                       \
         lua_newtable(state);                                                             \
         int number = 1;                                                                  \
         for (glm::length_t i = 0; i < ghoul::glm_components<__TYPE__>::value; ++i) {     \
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index cf4fb8aed0..e1a14f7e32 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -489,11 +489,11 @@ void LoadingScreen::render() {
                 for ( /* i */; i < MaxNumberLocationSamples && !foundSpace; ++i) {
                     std::uniform_int_distribution<int> distX(
                         15,
-                        res.x - b.boundingBox.x - 15
+                        static_cast<int>(res.x - b.boundingBox.x - 15)
                     );
                     std::uniform_int_distribution<int> distY(
                         15,
-                        res.y - b.boundingBox.y - 15
+                        static_cast<int>(res.y - b.boundingBox.y - 15)
                     );
 
                     ll = { distX(_randomEngine), distY(_randomEngine) };
diff --git a/src/scene/sceneloader.cpp b/src/scene/sceneloader.cpp
index e4fb101c55..ca7abda66e 100644
--- a/src/scene/sceneloader.cpp
+++ b/src/scene/sceneloader.cpp
@@ -119,10 +119,10 @@ std::unique_ptr<Scene> SceneLoader::loadScene(const std::string& path) {
         for (const std::string& key : keys) {
             std::string fullName = moduleDictionary.value<std::string>(key);
             std::replace(fullName.begin(), fullName.end(), '/', FileSys.PathSeparator);
-            std::string path = FileSys.pathByAppendingComponent(modulesPath, fullName);
+            std::string p = FileSys.pathByAppendingComponent(modulesPath, fullName);
 
             std::pair<std::vector<SceneLoader::LoadedNode>, std::vector<SceneLicense>>
-            nodes = loadDirectory(path, state);
+            nodes = loadDirectory(p, state);
 
             std::move(
                 nodes.first.begin(),
@@ -139,7 +139,8 @@ std::unique_ptr<Scene> SceneLoader::loadScene(const std::string& path) {
 
     std::unique_ptr<Scene> scene = std::make_unique<Scene>();
 
-    OsEng.loadingScreen().setItemNumber(allNodes.size() + 1); // +1 for Root node
+    // +1 for Root node
+    OsEng.loadingScreen().setItemNumber(static_cast<int>(allNodes.size() + 1));
 
     std::unique_ptr<SceneGraphNode> rootNode = std::make_unique<SceneGraphNode>();
     rootNode->setName(SceneGraphNode::RootNodeName);
diff --git a/src/util/blockplaneintersectiongeometry.cpp b/src/util/blockplaneintersectiongeometry.cpp
index 302af5a4b4..9d3e5db589 100644
--- a/src/util/blockplaneintersectiongeometry.cpp
+++ b/src/util/blockplaneintersectiongeometry.cpp
@@ -36,7 +36,6 @@ namespace {
 
 namespace openspace {
 
-
 BlockPlaneIntersectionGeometry::BlockPlaneIntersectionGeometry(
         glm::vec3 blockSize,
         glm::vec3 planeNormal,
@@ -52,7 +51,6 @@ BlockPlaneIntersectionGeometry::~BlockPlaneIntersectionGeometry() {
     glDeleteVertexArrays(1, &_vaoId);
 }
 
-
 void BlockPlaneIntersectionGeometry::setBlockSize(glm::vec3 size) {
     _size = size;
     updateVertices();
diff --git a/src/util/boxgeometry.cpp b/src/util/boxgeometry.cpp
index e224fd5355..fae2f1b238 100644
--- a/src/util/boxgeometry.cpp
+++ b/src/util/boxgeometry.cpp
@@ -113,7 +113,7 @@ bool BoxGeometry::initialize() {
     glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), &vertices, GL_STATIC_DRAW);
 
     glEnableVertexAttribArray(0);
-    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 3, 0);
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 3, nullptr);
 
     glBindVertexArray(0);
     return true;
diff --git a/src/util/factorymanager.cpp b/src/util/factorymanager.cpp
index 48bce82c18..f3d4fcb143 100644
--- a/src/util/factorymanager.cpp
+++ b/src/util/factorymanager.cpp
@@ -81,11 +81,11 @@ FactoryManager& FactoryManager::ref() {
     return *_manager;
 }
 
-void FactoryManager::addFactory(std::unique_ptr<ghoul::TemplateFactoryBase> factory,
+void FactoryManager::addFactory(std::unique_ptr<ghoul::TemplateFactoryBase> f,
                                 std::string name
 ) {
-    ghoul_assert(factory, "Factory must not be nullptr");
-    _factories.push_back({ std::move(factory), std::move(name) });
+    ghoul_assert(f, "Factory must not be nullptr");
+    _factories.push_back({ std::move(f), std::move(name) });
 }
 
 std::string FactoryManager::generateJson() const {
@@ -97,8 +97,8 @@ std::string FactoryManager::generateJson() const {
         json << "\"name\": \"" << factoryInfo.name << "\",";
         json << "\"classes\": [";
 
-        ghoul::TemplateFactoryBase* factory = factoryInfo.factory.get();
-        const std::vector<std::string>& registeredClasses = factory->registeredClasses();
+        ghoul::TemplateFactoryBase* f = factoryInfo.factory.get();
+        const std::vector<std::string>& registeredClasses = f->registeredClasses();
         for (const std::string& c : registeredClasses) {
             json << "\"" << c << "\"";
             if (&c != &registeredClasses.back()) {
diff --git a/src/util/histogram.cpp b/src/util/histogram.cpp
index ea98fc0b3b..f4276471b2 100644
--- a/src/util/histogram.cpp
+++ b/src/util/histogram.cpp
@@ -115,10 +115,10 @@ bool Histogram::add(float value, float repeat) {
     }
 
     float normalizedValue = (value - _minValue) / (_maxValue - _minValue);   // [0.0, 1.0]
-    int binIndex = std::min(
+    int binIndex = static_cast<int>(std::min(
         static_cast<float>(floor(normalizedValue * _numBins)),
         _numBins - 1.f
-    ); // [0, _numBins - 1]
+    )); // [0, _numBins - 1]
 
     _data[binIndex] += repeat;
     _numValues += repeat;
@@ -138,10 +138,10 @@ void Histogram::changeRange(float minValue, float maxValue){\
         float unNormalizedValue = i*(oldMax-oldMin)+oldMin;
         float normalizedValue = (unNormalizedValue - _minValue) /
                                 (_maxValue - _minValue);      // [0.0, 1.0]
-        int binIndex = std::min(
+        int binIndex = static_cast<int>(std::min(
             static_cast<float>(floor(normalizedValue * _numBins)),
             _numBins - 1.f
-        ); // [0, _numBins - 1]
+        )); // [0, _numBins - 1]
 
         newData[binIndex] = oldData[i];
     }
@@ -187,8 +187,8 @@ bool Histogram::addRectangle(float lowBin, float highBin, float value) {
     float lowBinIndex = normalizedLowBin * _numBins;
     float highBinIndex = normalizedHighBin * _numBins;
 
-    int fillLow = floor(lowBinIndex);
-    int fillHigh = ceil(highBinIndex);
+    int fillLow = static_cast<int>(floor(lowBinIndex));
+    int fillHigh = static_cast<int>(ceil(highBinIndex));
 
     for (int i = fillLow; i < fillHigh; i++) {
         _data[i] += value;
@@ -209,35 +209,37 @@ bool Histogram::addRectangle(float lowBin, float highBin, float value) {
 
 float Histogram::interpolate(float bin) const {
     float normalizedBin = (bin - _minValue) / (_maxValue - _minValue);
-    float binIndex = normalizedBin * _numBins - 0.5; // Center
+    float binIndex = normalizedBin * _numBins - 0.5f; // Center
 
     float interpolator = binIndex - floor(binIndex);
-    int binLow = floor(binIndex);
-    int binHigh = ceil(binIndex);
+    int binLow = static_cast<int>(floor(binIndex));
+    int binHigh = static_cast<int>(ceil(binIndex));
 
     // Clamp bins
-    if (binLow < 0) binLow = 0;
-    if (binHigh >= _numBins) binHigh = _numBins - 1;
+    if (binLow < 0) {
+        binLow = 0;
+    }
+    if (binHigh >= _numBins) {
+        binHigh = _numBins - 1;
+    }
 
-    return (1.0 - interpolator) * _data[binLow] + interpolator * _data[binHigh];
+    return (1.f - interpolator) * _data[binLow] + interpolator * _data[binHigh];
 }
 
 float Histogram::sample(int binIndex) const {
-    ghoul_assert(binIndex >= 0 && binIndex < _numBins, "@MISSING");
+    ghoul_assert(binIndex >= 0 && binIndex < _numBins, "binIndex out of range");
     return _data[binIndex];
 }
 
-
 const float* Histogram::data() const {
     return _data;
 }
 
-std::vector<std::pair<float,float>> Histogram::getDecimated(int numBins) const {
+std::vector<std::pair<float,float>> Histogram::getDecimated(int) const {
     // Return a copy of _data decimated as in Ljung 2004
     return std::vector<std::pair<float,float>>();
 }
 
-
 void Histogram::normalize() {
     float sum = 0.0;
     for (int i = 0; i < _numBins; i++) {
@@ -253,10 +255,10 @@ void Histogram::normalize() {
  * Old histogram value is the index of the array, and the new equalized
  * value will be the value at the index.
  */
-void Histogram::generateEqualizer(){
+void Histogram::generateEqualizer() {
     float previousCdf = 0.0f;
     _equalizer = std::vector<float>(_numBins, 0.0f);
-    for(int i = 0; i < _numBins; i++){
+    for (int i = 0; i < _numBins; i++) {
 
         float probability = _data[i] / static_cast<float>(_numValues);
         float cdf  = previousCdf + probability;
@@ -269,10 +271,10 @@ void Histogram::generateEqualizer(){
 /*
  * Will return a equalized histogram
  */
-Histogram Histogram::equalize(){
+Histogram Histogram::equalize() {
     Histogram equalizedHistogram(_minValue, _maxValue, _numBins);
 
-    for(int i = 0; i < _numBins; i++){
+    for (int i = 0; i < _numBins; i++) {
         equalizedHistogram._data[static_cast<int>(_equalizer[i])] += _data[i];
     }
     equalizedHistogram._numValues = _numValues;
@@ -283,7 +285,7 @@ Histogram Histogram::equalize(){
  * Given a value within the domain of this histogram (_minValue < value < maxValue),
  * this method will use its equalizer to return a histogram equalized result.
  */
-float Histogram::equalize(float value){
+float Histogram::equalize(float value) {
     // if (value < _minValue || value > _maxValue) {
     //     LWARNING(
     //         "Equalized value is is not within domain of histogram. min: " +
@@ -292,7 +294,7 @@ float Histogram::equalize(float value){
     //     );
     // }
     float normalizedValue = (value-_minValue)/(_maxValue-_minValue);
-    int bin = floor(normalizedValue * _numBins);
+    int bin = static_cast<int>(floor(normalizedValue * _numBins));
     // If value == _maxValues then bin == _numBins, which is a invalid index.
     bin = std::min(_numBins-1, bin);
     bin = std::max(0 , bin);
@@ -300,42 +302,42 @@ float Histogram::equalize(float value){
     return _equalizer[bin];
 }
 
-float Histogram::entropy(){
+float Histogram::entropy() {
     float entropy = 0.f;
     for (int i = 0; i < _numBins; ++i) {
         if (_data[i] != 0) {
-            entropy -= (static_cast<float>(_data[i])/_numValues) *
-                        log2(static_cast<float>(_data[i])/_numValues);
+            entropy -= (_data[i] / static_cast<float>(_numValues)) *
+                        (log2(_data[i]) / static_cast<float>(_numValues));
         }
     }
     return entropy;
 }
 
 void Histogram::print() const {
-    for (int i = 0; i < _numBins; i++) {
-        float low = _minValue + float(i) / _numBins * (_maxValue - _minValue);
-        float high = low + (_maxValue - _minValue) / float(_numBins);
-        // std::cout << i << " [" << low << ", " << high << "]"
-        //           << "   " << _data[i] << std::endl;
-        std::cout << _data[i]/static_cast<float>(_numValues) << ", ";
-    }
-    std::cout << std::endl;
-    // std::cout << std::endl << std::endl << std::endl<< "==============" << std::endl;
+    //for (int i = 0; i < _numBins; i++) {
+    //    //float low = _minValue + float(i) / _numBins * (_maxValue - _minValue);
+    //    //float high = low + (_maxValue - _minValue) / float(_numBins);
+    //    // std::cout << i << " [" << low << ", " << high << "]"
+    //    //           << "   " << _data[i] << std::endl;
+    //    std::cout << _data[i]/static_cast<float>(_numValues) << ", ";
+    //}
+    //std::cout << std::endl;
+    //// std::cout << std::endl << std::endl << std::endl<< "==============" << std::endl;
 }
 
 float Histogram::highestBinValue(bool equalized, int overBins){
     int highestBin = 0;
     float highestValue = 0;
 
-    for(int i=0; i<_numBins; i++){
+    for (int i = 0; i < _numBins; i++) {
         float value = 0;
         int num = 0;
-        for(int j=0; j<overBins; j++){
-            if(i-j>0){
+        for (int j=0; j<overBins; j++) {
+            if (i - j > 0) {
                 value += _data[i-j];
                 num++;
             }
-            if(i+j<_numBins){
+            if (i + j < _numBins) {
                 value += _data[i+j];
                 num++;
             }
@@ -344,7 +346,7 @@ float Histogram::highestBinValue(bool equalized, int overBins){
         value += _data[i];
         value /= static_cast<float>(++num);
 
-        if(value > highestValue){
+        if (value > highestValue) {
             highestBin = i;
             highestValue = value;
         }
@@ -355,15 +357,15 @@ float Histogram::highestBinValue(bool equalized, int overBins){
         float low = _minValue + static_cast<float>(highestBin) /
                     _numBins * (_maxValue - _minValue);
         float high = low + (_maxValue - _minValue) / static_cast<float>(_numBins);
-        return (high+low)/2.0;
+        return (high+low) / 2.f;
     } else {
-        return highestBin/static_cast<float>(_numBins);
+        return highestBin / static_cast<float>(_numBins);
         // return equalize((high+low)/2.0);
     }
 }
 
 float Histogram::binWidth() {
-    return (_maxValue-_minValue) / _numBins;
+    return (_maxValue - _minValue) / _numBins;
 }
 
 } // namespace openspace
diff --git a/src/util/keys.cpp b/src/util/keys.cpp
index a4d78e46f7..26402835b8 100644
--- a/src/util/keys.cpp
+++ b/src/util/keys.cpp
@@ -86,9 +86,9 @@ KeyWithModifier stringToKey(std::string str) {
 
     // default is unknown
     Key k = Key::Unknown;
-    auto it = KeyMapping.find(tokens.back());
-    if (it != KeyMapping.end()) {
-        k = it->second;
+    auto itKey = KeyMapping.find(tokens.back());
+    if (itKey != KeyMapping.end()) {
+        k = itKey->second;
     }
 
 
@@ -97,9 +97,9 @@ KeyWithModifier stringToKey(std::string str) {
         tokens.begin(),
         tokens.end() - 1,
         [&m](const std::string& s) {
-            auto it = KeyModifierMapping.find(s);
-            if (it != KeyModifierMapping.end()) {
-                m |= it->second;
+            auto itMod = KeyModifierMapping.find(s);
+            if (itMod != KeyModifierMapping.end()) {
+                m |= itMod->second;
             }
             else {
                 LERROR("Unknown modifier key '" << s << "'");
diff --git a/tests/test_gdalwms.inl b/tests/test_gdalwms.inl
index a936586e72..fad912e370 100644
--- a/tests/test_gdalwms.inl
+++ b/tests/test_gdalwms.inl
@@ -45,17 +45,17 @@
 class GdalWmsTest : public testing::Test {};
 
 TEST_F(GdalWmsTest, Simple) {
-    GDALDatasetH poDataset;
-    GDALAllRegister();
+    //GDALDatasetH poDataset;
+    //GDALAllRegister();
 
-    
-    std::string res = GDALVersionInfo("format");
-    
-    std::cout << res << std::endl;
+    //
+    //std::string res = GDALVersionInfo("format");
+    //
+    //std::cout << res << std::endl;
 
-    std::string testFile = absPath("${TESTDIR}/gdal/TERRA_CR_B143_2016-04-12.wms");
+    //std::string testFile = absPath("${TESTDIR}/gdal/TERRA_CR_B143_2016-04-12.wms");
 
-    poDataset = GDALOpen(testFile.c_str(), GA_ReadOnly);
+    //poDataset = GDALOpen(testFile.c_str(), GA_ReadOnly);
 
     // This assertion fails
     //ASSERT_NE(poDataset, nullptr) << "Failed to load testFile";
diff --git a/tests/test_luaconversions.inl b/tests/test_luaconversions.inl
index ea44fbe8f5..79f258f1e9 100644
--- a/tests/test_luaconversions.inl
+++ b/tests/test_luaconversions.inl
@@ -92,7 +92,20 @@ CONVERSION_TEST_NUMERICAL(SignedChar, signed char, 1)
 CONVERSION_TEST_NUMERICAL(UnsignedChar, unsigned char, 1)
 CONVERSION_TEST_NUMERICAL(Short, short, 1)
 CONVERSION_TEST_NUMERICAL(UnsignedShort, unsigned short, 1)
-CONVERSION_TEST_NUMERICAL(Int, int, 1)
+
+//CONVERSION_TEST_NUMERICAL(Int, int, 1)
+// Need to separate int into its own test as otherwise static_cast<int>(1) would throw a
+// useless cast warning
+TEST_F(LuaConversionTest, Int) {                                                                                    
+    using namespace openspace::properties;
+    bool success = PropertyDelegate<NumericalProperty<int>>::toLuaValue<int>(state, 1);                                                   
+    EXPECT_TRUE(success) << "toLuaValue";                                            
+    int value = 0;                                       
+    value = PropertyDelegate<NumericalProperty<int>>::fromLuaValue<int>(state, success);                                                           
+    EXPECT_TRUE(success) << "fromLuaValue";                                          
+    EXPECT_EQ(value, 1) << "fromLuaValue";                                   
+}
+
 CONVERSION_TEST_NUMERICAL(UnsignedInt, unsigned int, 1)
 CONVERSION_TEST_NUMERICAL(Long, long, 1)
 CONVERSION_TEST_NUMERICAL(UnsignedLong, unsigned long, 1)