diff --git a/apps/opencs/view/world/dragrecordtable.cpp b/apps/opencs/view/world/dragrecordtable.cpp
index d795bd5de1..f84bf639da 100644
--- a/apps/opencs/view/world/dragrecordtable.cpp
+++ b/apps/opencs/view/world/dragrecordtable.cpp
@@ -19,14 +19,10 @@ void CSVWorld::DragRecordTable::startDragFromTable (const CSVWorld::DragRecordTa
     }
 
     CSMWorld::TableMimeData* mime = new CSMWorld::TableMimeData (records, mDocument);
-
-    if (mime)
-    {
-        QDrag* drag = new QDrag (this);
-        drag->setMimeData (mime);
-        drag->setPixmap (QString::fromUtf8 (mime->getIcon().c_str()));
-        drag->exec (Qt::CopyAction);
-    }
+    QDrag* drag = new QDrag (this);
+    drag->setMimeData (mime);
+    drag->setPixmap (QString::fromUtf8 (mime->getIcon().c_str()));
+    drag->exec (Qt::CopyAction);
 }
 
 CSVWorld::DragRecordTable::DragRecordTable (CSMDoc::Document& document, QWidget* parent) :
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index a4ab20fd68..45defe9a56 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -587,7 +587,7 @@ namespace MWGui
         // effect box can have variable width -> variable left coordinate
         int effectsDx = 0;
         if (!mMinimapBox->getVisible ())
-            effectsDx = (viewSize.width - mMinimapBoxBaseRight) - (viewSize.width - mEffectBoxBaseRight);
+            effectsDx = mEffectBoxBaseRight - mMinimapBoxBaseRight;
 
         mMapVisible = mMinimapBox->getVisible ();
         if (!mMapVisible)
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index ba300accbc..366da6439c 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -583,7 +583,7 @@ namespace MWRender
             }
 
             mOverlayImage->copySubImage(imageDest.mX, imageDest.mY, 0, imageDest.mImage);
-            it = mPendingImageDest.erase(it);
+            mPendingImageDest.erase(it);
             return true;
         }
     }
diff --git a/components/terrain/terraindrawable.cpp b/components/terrain/terraindrawable.cpp
index 0d82be4fff..746534abb4 100644
--- a/components/terrain/terraindrawable.cpp
+++ b/components/terrain/terraindrawable.cpp
@@ -78,7 +78,7 @@ void TerrainDrawable::cull(osgUtil::CullVisitor *cv)
 
     osg::RefMatrix& matrix = *cv->getModelViewMatrix();
 
-    if (cv->getComputeNearFarMode() && bb.valid())
+    if (cv->getComputeNearFarMode() != osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR && bb.valid())
     {
         if (!cv->updateCalculatedNearFar(matrix, *this, false))
             return;