diff --git a/AUTHORS.md b/AUTHORS.md
index caaccc158..a37975d24 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -22,6 +22,7 @@ Programmers
     Alexander Nadeau (wareya)
     Alexander Olofsson (Ace)
     Allofich
+    Andrei Kortunov (akortunov)
     AnyOldName3
     Aussiemon
     Austin Salgat (Salgat)
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 654d654c7..f24017686 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1959,12 +1959,14 @@ namespace MWGui
 
     void WindowManager::cycleSpell(bool next)
     {
-        mSpellWindow->cycle(next);
+        if (!isGuiMode())
+            mSpellWindow->cycle(next);
     }
 
     void WindowManager::cycleWeapon(bool next)
     {
-        mInventoryWindow->cycle(next);
+        if (!isGuiMode())
+            mInventoryWindow->cycle(next);
     }
 
     void WindowManager::setConsoleSelectedObject(const MWWorld::Ptr &object)
diff --git a/components/sceneutil/optimizer.cpp b/components/sceneutil/optimizer.cpp
index b5cee6966..e7d5b3a40 100644
--- a/components/sceneutil/optimizer.cpp
+++ b/components/sceneutil/optimizer.cpp
@@ -1057,7 +1057,7 @@ void Optimizer::MergeGeometryVisitor::checkAllowedToMerge()
     {
         osg::StateSet* stateSet = *it;
         osg::StateSet::RenderBinMode mode = stateSet->getRenderBinMode();
-        if (override && (!mode & osg::StateSet::PROTECTED_RENDERBIN_DETAILS))
+        if (override && !(mode & osg::StateSet::PROTECTED_RENDERBIN_DETAILS))
             continue;
         if (mode & osg::StateSet::USE_RENDERBIN_DETAILS)
             renderingHint = stateSet->getRenderingHint();
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index d65b1d5ed..f2a80d673 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -37,7 +37,7 @@ namespace
         return targetlevel;
     }
 
-    float distance(const osg::BoundingBox& box, const osg::Vec3f& v)
+    float distanceToBox(const osg::BoundingBox& box, const osg::Vec3f& v)
     {
         if (box.contains(v))
             return 0;
@@ -79,7 +79,7 @@ public:
 
     virtual bool isSufficientDetail(QuadTreeNode* node, const osg::Vec3f& eyePoint)
     {
-        float dist = distance(node->getBoundingBox(), eyePoint);
+        float dist = distanceToBox(node->getBoundingBox(), eyePoint);
         int nativeLodLevel = Log2(static_cast<unsigned int>(node->getSize()/mMinSize));
         int lodLevel = Log2(static_cast<unsigned int>(dist/(8192*mMinSize)));