diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 239d714a0..520630bac 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -432,7 +432,7 @@ namespace MWWorld
         mHasState = true;
     }
 
-    int CellStore::count() const
+    std::size_t CellStore::count() const
     {
         return mMergedRefs.size();
     }
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 1c4d8f5d8..f4d430521 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -240,7 +240,7 @@ namespace MWWorld
 
             ESM::FogState* getFog () const;
 
-            int count() const;
+            std::size_t count() const;
             ///< Return total number of references, including deleted ones.
 
             void load ();
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 30e73df58..f554b5a64 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -379,7 +379,7 @@ namespace MWWorld
             unloadCell (active++);
         }
 
-        int refsToLoad = 0;
+        std::size_t refsToLoad = 0;
         // get the number of refs to load
         for (int x=X-mHalfGridSize; x<=X+mHalfGridSize; ++x)
         {
@@ -553,8 +553,7 @@ namespace MWWorld
         while (active!=mActiveCells.end())
             unloadCell (active++);
 
-        int refsToLoad = cell->count();
-        loadingListener->setProgressRange(refsToLoad);
+        loadingListener->setProgressRange(cell->count());
 
         // Load cell.
         loadCell (cell, loadingListener, changeEvent);