diff --git a/source/Command.cpp b/source/Command.cpp
index 0806c27a..54ad3ed8 100644
--- a/source/Command.cpp
+++ b/source/Command.cpp
@@ -1080,8 +1080,8 @@ void Register(HSQUIRRELVM vm)
         .Func(_SC("Clear"), &Manager::Clear)
         .Func(_SC("Attach"), &Manager::Attach)
         .Func(_SC("FindByName"), &Manager::FindByName)
-        .Func(_SC("BindOnFail"), &Manager::SetOnFail)
-        .Func(_SC("BindOnAuth"), &Manager::SetOnAuth)
+        .Func(_SC("BindFail"), &Manager::SetOnFail)
+        .Func(_SC("BindAuth"), &Manager::SetOnAuth)
         .Func(_SC("GetArray"), &Manager::GetCommandsArray)
         .Func(_SC("GetTable"), &Manager::GetCommandsTable)
         .Func(_SC("Foreach"), &Manager::ForeachCommand)
diff --git a/source/Command.hpp b/source/Command.hpp
index d2c4dfa6..e40f6085 100644
--- a/source/Command.hpp
+++ b/source/Command.hpp
@@ -1754,7 +1754,7 @@ public:
         // Perform the requested check
         return  (f == CMDARG_ANY) ||    // Requires check?
                 (f & flag) ||           // Exact match?
-                (f & CMDARG_GREEDY && flag & CMDARG_STRING);
+                ((f & CMDARG_GREEDY) && (flag & CMDARG_STRING));
     }
 
     /* --------------------------------------------------------------------------------------------