diff --git a/include/chaiscript/language/chaiscript_parser.hpp b/include/chaiscript/language/chaiscript_parser.hpp
index 37698d2..c19a55b 100644
--- a/include/chaiscript/language/chaiscript_parser.hpp
+++ b/include/chaiscript/language/chaiscript_parser.hpp
@@ -545,6 +545,7 @@ namespace chaiscript
           longlong_ = true;
         }
 
+
         if (longlong_)
         {
           size = sizeof(int64_t) * 8;
@@ -559,7 +560,7 @@ namespace chaiscript
 
         if (unsignedrequired && !unsigned_)
         {
-          if (t_type == std::hex || t_type == std::oct)
+          if (t_type == &std::hex || t_type == &std::oct)
           {
             // with hex and octal we are happy to just make it unsigned
             unsigned_ = true;
diff --git a/unittests/multithreaded_test.cpp b/unittests/multithreaded_test.cpp
index 6edc5a1..806dfb6 100644
--- a/unittests/multithreaded_test.cpp
+++ b/unittests/multithreaded_test.cpp
@@ -7,6 +7,7 @@
 #include <iostream>
 
 #include <list>
+#include <algorithm>
 
 #include <chaiscript/chaiscript.hpp>