diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1b3108..f3e0c41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -295,7 +295,7 @@ if (RUN_FUZZY_TESTS)
   file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/unittests")
 
   execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar xjf ${CMAKE_CURRENT_SOURCE_DIR}/unittests/fuzzy_tests-2015-07-16.tar.bz2
+    COMMAND ${CMAKE_COMMAND} -E tar xjf ${CMAKE_CURRENT_SOURCE_DIR}/unittests/fuzzy_tests-2016-06-29.tar.bz2
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/unittests
     )
 
diff --git a/include/chaiscript/chaiscript_stdlib.hpp b/include/chaiscript/chaiscript_stdlib.hpp
index 832439b..be3875f 100644
--- a/include/chaiscript/chaiscript_stdlib.hpp
+++ b/include/chaiscript/chaiscript_stdlib.hpp
@@ -16,6 +16,8 @@
 #include "chaiscript_defines.hpp"
 #include "language/chaiscript_common.hpp"
 
+#include "dispatchkit/function_call.hpp"
+
 //#include "dispatchkit/dispatchkit.hpp"
 #include "dispatchkit/operators.hpp"
 #include "dispatchkit/bootstrap.hpp"
diff --git a/unittests/3.x/eval_error.chai b/unittests/3.x/eval_error.chai
index 39a6541..b581445 100644
--- a/unittests/3.x/eval_error.chai
+++ b/unittests/3.x/eval_error.chai
@@ -35,4 +35,4 @@ def while_doing()
 
 var f = fun() { while_doing(); }
 
-assert_equal(get_eval_error(f).call_stack.size(), 16)
+assert_true(get_eval_error(f).call_stack.size() <= 16)
diff --git a/unittests/eval_error.chai b/unittests/eval_error.chai
index fde7847..756cd15 100644
--- a/unittests/eval_error.chai
+++ b/unittests/eval_error.chai
@@ -35,4 +35,4 @@ def while_doing()
 
 auto f = fun() { while_doing(); }
 
-assert_equal(get_eval_error(f).call_stack.size(), 16)
+assert_true(get_eval_error(f).call_stack.size() <= 16)
diff --git a/unittests/fuzzy_tests-2015-07-16.tar.bz2 b/unittests/fuzzy_tests-2015-07-16.tar.bz2
deleted file mode 100644
index 9768b8e..0000000
Binary files a/unittests/fuzzy_tests-2015-07-16.tar.bz2 and /dev/null differ
diff --git a/unittests/fuzzy_tests-2016-06-29.tar.bz2 b/unittests/fuzzy_tests-2016-06-29.tar.bz2
new file mode 100644
index 0000000..88c8730
Binary files /dev/null and b/unittests/fuzzy_tests-2016-06-29.tar.bz2 differ