diff --git a/apps/openmw/mwdialogue/selectwrapper.cpp b/apps/openmw/mwdialogue/selectwrapper.cpp
index bba17bfd1..1462ee8ba 100644
--- a/apps/openmw/mwdialogue/selectwrapper.cpp
+++ b/apps/openmw/mwdialogue/selectwrapper.cpp
@@ -6,6 +6,7 @@
 #include <stdexcept>
 #include <algorithm>
 #include <sstream>
+#include <iterator>
 
 namespace
 {
diff --git a/apps/openmw/mwworld/failedaction.cpp b/apps/openmw/mwworld/failedaction.cpp
index 8c64db69f..ec763dba0 100644
--- a/apps/openmw/mwworld/failedaction.cpp
+++ b/apps/openmw/mwworld/failedaction.cpp
@@ -9,11 +9,11 @@ namespace MWWorld
 {
     FailedAction::FailedAction (const std::string& msg) : Action (false), message(msg)
     {   }
-    
-    
+
+
     void FailedAction::executeImp (const Ptr& actor)
     {
-        if ( actor.getRefData().getHandle()=="player" and !(message.empty()))
+        if ( actor.getRefData().getHandle()=="player" && !(message.empty()))
 	{
 	  MWBase::Environment::get().getWindowManager() ->messageBox(message, std::vector<std::string>());
 	}