diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index ab627b6f6..d4cbf25fe 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -149,9 +149,9 @@ void Objects::removeCell(const MWWorld::CellStore* store)
 
             if (ptr.getClass().isNpc() && ptr.getRefData().getCustomData())
             {
-                MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
-                store.setInvListener(NULL, ptr);
-                store.setContListener(NULL);
+                MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
+                invStore.setInvListener(NULL, ptr);
+                invStore.setContListener(NULL);
             }
 
             mObjects.erase(iter++);
diff --git a/components/esm/loadland.cpp b/components/esm/loadland.cpp
index 0869eb7be..72c3eb98d 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@@ -335,7 +335,4 @@ namespace ESM
             }
         }
     }
-
-    const int Land::LAND_SIZE;
-
 }
diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index 4af1c4c0d..63efb36be 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -240,8 +240,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 = 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);
+                int rowEnd = std::min(static_cast<int>(rowStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1), static_cast<int>(ESM::Land::LAND_SIZE));
+                int colEnd = std::min(static_cast<int>(colStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1), static_cast<int>(ESM::Land::LAND_SIZE));
 
                 vertY = vertY_;
                 for (int col=colStart; col<colEnd; col += increment)