diff --git a/src/Text/Font.cpp b/src/Text/Font.cpp
index 0ee3f4bd5..c502be3ae 100644
--- a/src/Text/Font.cpp
+++ b/src/Text/Font.cpp
@@ -89,7 +89,7 @@ void Font::prerender(const std::string& characters, const Vector2i& atlasSize) {
     }
 
     /* Create texture atlas */
-    std::vector<Rectanglei> charPositions = TextureTools::atlas(atlasSize, charSizes);
+    const std::vector<Rectanglei> charPositions = TextureTools::atlas(atlasSize, charSizes);
 
     /* Render all characters to the atlas and create character map */
     glyphs.reserve(charPositions.size());
diff --git a/src/TextureTools/Atlas.cpp b/src/TextureTools/Atlas.cpp
index e5ece9e47..101123986 100644
--- a/src/TextureTools/Atlas.cpp
+++ b/src/TextureTools/Atlas.cpp
@@ -31,7 +31,7 @@ std::vector<Rectanglei> atlas(const Vector2i& atlasSize, const std::vector<Vecto
     std::vector<Rectanglei> atlas;
 
     /* Columns and rows */
-    Vector2i gridSize = atlasSize/maxSize;
+    const Vector2i gridSize = atlasSize/maxSize;
     if(std::size_t(gridSize.product()) < sizes.size()) {
         Error() << "TextureTools::atlas(): requested atlas size" << atlasSize
                 << "is too small to fit" << sizes.size() << maxSize