diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index 4e2a3caab..896d78385 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -101,6 +101,14 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh)
             sg = mRenderer.getScene()->createStaticGeometry( "sg" + Ogre::StringConverter::toString(uniqueID));
             //Create the scenenode and put it in the map
             mStaticGeometry[ptr.getCell()] = sg;
+
+            // This specifies the size of a single batch region.
+            // If it is set too high:
+            //  - there will be problems choosing the correct lights
+            //  - the culling will be more inefficient
+            // If it is set too low:
+            //  - there will be too many batches.
+            sg->setRegionDimensions(Ogre::Vector3(1000,1000,1000));
         }
         else
         {
@@ -108,7 +116,6 @@ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh)
         }
 
         sg->addEntity(ent,insert->_getDerivedPosition(),insert->_getDerivedOrientation(),insert->_getDerivedScale());
-        sg->setRegionDimensions(Ogre::Vector3(100000,10000,100000));
 
         mRenderer.getScene()->destroyEntity(ent);
     }
diff --git a/components/nifogre/ogre_nif_loader.cpp b/components/nifogre/ogre_nif_loader.cpp
index 91ac3918e..baf33d51f 100644
--- a/components/nifogre/ogre_nif_loader.cpp
+++ b/components/nifogre/ogre_nif_loader.cpp
@@ -350,7 +350,7 @@ void NIFLoader::createMaterial(const String &name,
     float num_lights;
     if (GpuProgramManager::getSingleton().isSyntaxSupported("fp40") ||
         GpuProgramManager::getSingleton().isSyntaxSupported("ps_4_0"))
-        num_lights = 16 /* 32 */;
+        num_lights = 8 /* 32 */;
     else
         num_lights = 8;