diff --git a/sol/compatibility/5.x.x.h b/sol/compatibility/5.x.x.h
index 79008998..9eb6f5a0 100644
--- a/sol/compatibility/5.x.x.h
+++ b/sol/compatibility/5.x.x.h
@@ -24,7 +24,7 @@
 
 #include "version.hpp"
 
-#if SOL_LUA_VERSION < 520
+#if SOL_LUA_VERSION < 502
 
 #define LUA_RIDX_GLOBALS LUA_GLOBALSINDEX
 
diff --git a/sol/stack.hpp b/sol/stack.hpp
index 6516309b..7144100a 100644
--- a/sol/stack.hpp
+++ b/sol/stack.hpp
@@ -592,22 +592,22 @@ inline void call(lua_State* L, int start, indices<I...>, types<void>, types<Args
 
 template <bool checkargs = detail::default_check_arguments, typename R, typename... Args, typename Fx, typename... FxArgs, typename = typename std::enable_if<!std::is_void<R>::value>::type>
 inline R call(lua_State* L, int start, types<R> tr, types<Args...> ta, Fx&& fx, FxArgs&&... args) {
-    return detail::call(L, start, ta, tr, ta, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+    return detail::call<checkargs>(L, start, ta, tr, ta, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
 }
 
 template <bool checkargs = detail::default_check_arguments, typename R, typename... Args, typename Fx, typename... FxArgs, typename = typename std::enable_if<!std::is_void<R>::value>::type>
 inline R call(lua_State* L, types<R> tr, types<Args...> ta, Fx&& fx, FxArgs&&... args) {
-    return call(L, 0, ta, tr, ta, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+    return call<checkargs>(L, 0, ta, tr, ta, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
 }
 
 template <bool checkargs = detail::default_check_arguments, typename... Args, typename Fx, typename... FxArgs>
 inline void call(lua_State* L, int start, types<void> tr, types<Args...> ta, Fx&& fx, FxArgs&&... args) {
-    detail::call(L, start, ta, tr, ta, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+    detail::call<checkargs>(L, start, ta, tr, ta, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
 }
 
 template <bool checkargs = detail::default_check_arguments, typename... Args, typename Fx, typename... FxArgs>
 inline void call(lua_State* L, types<void> tr, types<Args...> ta, Fx&& fx, FxArgs&&... args) {
-    call(L, 0, ta, tr, ta, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
+    call<checkargs>(L, 0, ta, tr, ta, std::forward<Fx>(fx), std::forward<FxArgs>(args)...);
 }
 
 inline call_syntax get_call_syntax(lua_State* L, const std::string& meta) {
diff --git a/sol/state.hpp b/sol/state.hpp
index 04b538e2..fcd8a202 100644
--- a/sol/state.hpp
+++ b/sol/state.hpp
@@ -58,7 +58,7 @@ public:
     state():
     L(luaL_newstate(), lua_close),
     reg(L.get(), LUA_REGISTRYINDEX),
-#if SOL_LUA_VERSION < 520
+#if SOL_LUA_VERSION < 503
     // Global table is just a special index
     global(L.get(), LUA_GLOBALSINDEX) {
 #else
diff --git a/sol/types.hpp b/sol/types.hpp
index e7b82d7e..f4e8e69c 100644
--- a/sol/types.hpp
+++ b/sol/types.hpp
@@ -118,64 +118,43 @@ class function;
 class object;
 
 template <typename T, typename = void>
-struct lua_type_of : std::integral_constant<type, type::userdata> {
-
-};
+struct lua_type_of : std::integral_constant<type, type::userdata> {};
 
 template <>
-struct lua_type_of<std::string> : std::integral_constant<type, type::string> {
-
-};
+struct lua_type_of<std::string> : std::integral_constant<type, type::string> {};
 
 template <std::size_t N>
-struct lua_type_of<char[N]> : std::integral_constant<type, type::string> {
-
-};
+struct lua_type_of<char[N]> : std::integral_constant<type, type::string> {};
 
 template <>
-struct lua_type_of<const char*> : std::integral_constant<type, type::string> {
-
-};
+struct lua_type_of<const char*> : std::integral_constant<type, type::string> {};
 
 template <>
-struct lua_type_of<bool> : std::integral_constant<type, type::boolean> {
-
-};
+struct lua_type_of<bool> : std::integral_constant<type, type::boolean> {};
 
 template <>
-struct lua_type_of<nil_t> : std::integral_constant<type, type::nil> {
-
-};
+struct lua_type_of<nil_t> : std::integral_constant<type, type::nil> {};
 
 template <>
-struct lua_type_of<table> : std::integral_constant<type, type::table> {
-
-};
+struct lua_type_of<table> : std::integral_constant<type, type::table> {};
 
 template <>
-struct lua_type_of<object> : std::integral_constant<type, type::poly> {
-
-};
+struct lua_type_of<object> : std::integral_constant<type, type::poly> {};
 
 template <>
-struct lua_type_of<light_userdata> : std::integral_constant<type, type::lightuserdata> {
-
-};
+struct lua_type_of<light_userdata> : std::integral_constant<type, type::lightuserdata> {};
 
 template <>
-struct lua_type_of<function> : std::integral_constant<type, type::function> {
+struct lua_type_of<function> : std::integral_constant<type, type::function> {};
 
-};
+template <typename Signature>
+struct lua_type_of<std::function<Signature>> : std::integral_constant<type, type::function>{};
 
 template <typename T>
-struct lua_type_of<T*> : std::integral_constant<type, type::userdata> {
-
-};
+struct lua_type_of<T*> : std::integral_constant<type, type::userdata> {};
 
 template <typename T>
-struct lua_type_of<T, typename std::enable_if<std::is_arithmetic<T>::value>::type> : std::integral_constant<type, type::number> {
-
-};
+struct lua_type_of<T, typename std::enable_if<std::is_arithmetic<T>::value>::type> : std::integral_constant<type, type::number> {};
 
 template<typename T>
 inline type type_of() {
diff --git a/tests.cpp b/tests.cpp
index f2baa3c7..83be07f6 100644
--- a/tests.cpp
+++ b/tests.cpp
@@ -1,4 +1,5 @@
 #define CATCH_CONFIG_MAIN
+#define SOL_CHECK_ARGUMENTS
 #include <catch.hpp>
 #include <sol.hpp>
 #include <vector>