diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 988879379..d552e045d 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -153,7 +153,7 @@ namespace MWMechanics
             if(mDistance &&            // actor is not intended to be stationary
                mIdleNow &&             // but is in idle
                !mWalking &&            // FIXME: some actors are idle while walking
-               proximityToDoor(actor)) // NOTE: checks interior cells only
+               proximityToDoor(actor, MIN_DIST_TO_DOOR_SQUARED*1.6*1.6)) // NOTE: checks interior cells only
             {
                 mIdleNow = false;
                 mMoveNow = true;
diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp
index 6694de096..181560935 100644
--- a/apps/openmw/mwmechanics/obstacle.cpp
+++ b/apps/openmw/mwmechanics/obstacle.cpp
@@ -43,8 +43,8 @@ namespace MWMechanics
         {
             MWWorld::LiveCellRef<ESM::Door>& ref = *it;
             if(pos.squaredDistance(Ogre::Vector3(ref.mRef.mPos.pos)) < minSqr)
-                if(closed && ref.mData.getLocalRotation().rot[2] == 0 ||
-                   !closed && ref.mData.getLocalRotation().rot[2] >= 1)
+                if((closed && ref.mData.getLocalRotation().rot[2] == 0) ||
+                   (!closed && ref.mData.getLocalRotation().rot[2] >= 1))
                 {
                     return true; // found, stop searching
                 }