diff --git a/src/Arguments.cpp b/src/Arguments.cpp
index ff4aacacf..a240abaa8 100644
--- a/src/Arguments.cpp
+++ b/src/Arguments.cpp
@@ -673,8 +673,8 @@ bool Arguments::find_command (std::string& command)
 ////////////////////////////////////////////////////////////////////////////////
 std::string Arguments::find_limit ()
 {
-  std::vector <std::pair <std::string, std::string> >::iterator arg;
-  for (arg = this->begin (); arg != this->end (); ++arg)
+  std::vector <std::pair <std::string, std::string> >::reverse_iterator arg;
+  for (arg = this->rbegin (); arg != this->rend (); ++arg)
     if (arg->first.find ("limit:") != std::string::npos)
       return arg->first.substr (6);
 
diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp
index 12c31767a..d98571f02 100644
--- a/src/commands/CmdCustom.cpp
+++ b/src/commands/CmdCustom.cpp
@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <iostream>
 #include <sstream>
 #include <map>
 #include <vector>