diff --git a/components/esm/loadland.cpp b/components/esm/loadland.cpp
index 72c3eb98d..0869eb7be 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@@ -335,4 +335,7 @@ namespace ESM
             }
         }
     }
+
+    const int Land::LAND_SIZE;
+
 }
diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index d1138a147..8009f48ad 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -232,8 +232,8 @@ namespace ESMTerrain
                 // Only relevant for chunks smaller than (contained in) one cell
                 rowStart += (origin.x() - startCellX) * ESM::Land::LAND_SIZE;
                 colStart += (origin.y() - startCellY) * ESM::Land::LAND_SIZE;
-                int rowEnd = rowStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1;
-                int colEnd = colStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1;
+                int rowEnd = std::min(static_cast<int>(rowStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1), ESM::Land::LAND_SIZE);
+                int colEnd = std::min(static_cast<int>(colStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1), ESM::Land::LAND_SIZE);
 
                 vertY = vertY_;
                 for (int col=colStart; col<colEnd; col += increment)