diff --git a/include/chaiscript/dispatchkit/boxed_number.hpp b/include/chaiscript/dispatchkit/boxed_number.hpp
index 68b2f0b..2d44b7e 100644
--- a/include/chaiscript/dispatchkit/boxed_number.hpp
+++ b/include/chaiscript/dispatchkit/boxed_number.hpp
@@ -588,12 +588,19 @@ namespace chaiscript
       template<typename Source, typename Target> 
       static void check_type()
       {
+#ifdef CHAISCRIPT_MSVC
+#pragma warning(push)
+#pragma warning(disable : 4127)
+#endif
         if (sizeof(Source) != sizeof(Target)
             || std::is_signed<Source>() != std::is_signed<Target>()
             || std::is_floating_point<Source>() != std::is_floating_point<Target>())
         {
           throw chaiscript::detail::exception::bad_any_cast();
         }
+#ifdef CHAISCRIPT_MSVC
+#pragma warning(pop)
+#endif
       }
 
       template<typename Target> Target get_as_checked() const
diff --git a/include/chaiscript/language/chaiscript_engine.hpp b/include/chaiscript/language/chaiscript_engine.hpp
index f4550e8..828fc40 100644
--- a/include/chaiscript/language/chaiscript_engine.hpp
+++ b/include/chaiscript/language/chaiscript_engine.hpp
@@ -145,9 +145,6 @@ namespace chaiscript
               })
           , "call_exists");
 
-//      m_engine.add(fun<Boxed_Value (const dispatch::Proxy_Function_Base *, const std::vector<Boxed_Value> &)>(std::bind(&chaiscript::dispatch::Proxy_Function_Base::operator(), std::placeholders::_1, std::placeholders::_2, std::ref(m_engine.conversions()))), "call");
-//
-//
 
       m_engine.add(fun(
             [=](const dispatch::Proxy_Function_Base &t_fun, const std::vector<Boxed_Value> &t_params) -> Boxed_Value {
diff --git a/unittests/integer_literal_test.cpp b/unittests/integer_literal_test.cpp
index 114883c..9112374 100644
--- a/unittests/integer_literal_test.cpp
+++ b/unittests/integer_literal_test.cpp
@@ -3,6 +3,12 @@
 #include "../static_libs/chaiscript_stdlib.hpp"
 
 
+#ifdef CHAISCRIPT_MSVC
+#pragma warning(push)
+#pragma warning(disable : 4146)
+#endif
+
+
 #define TEST_LITERAL(v) test_literal(v, #v)
 #define TEST_LITERAL_SIGNED(v) test_literal(v, #v, true)
 
@@ -269,8 +275,9 @@ int main()
     return EXIT_FAILURE;
   }
 
-
-
-
-
 }
+
+
+#ifdef CHAISCRIPT_MSVC
+#pragma warning(pop)
+#endif