diff --git a/libs/luabind/luabind/detail/conversion_policies/function_converter.hpp b/libs/luabind/luabind/detail/conversion_policies/function_converter.hpp
index 13c27da09..905784730 100644
--- a/libs/luabind/luabind/detail/conversion_policies/function_converter.hpp
+++ b/libs/luabind/luabind/detail/conversion_policies/function_converter.hpp
@@ -39,15 +39,13 @@ namespace luabind {
 
 		template< typename T >
 		struct is_function< std::function< T > > : public std::true_type {};
-
-		template< typename R, typename... Args, typename WrappedType >
-		struct deduce_signature <std::function< R(Args...) >, WrappedType >
-		{
-			using type = meta::type_list< R, Args... >;
-		};
-
 	}
 
+	template< typename R, typename... Args, typename WrappedType >
+	struct deduce_signature <std::function< R(Args...) >, WrappedType >
+	{
+		using type = meta::type_list< R, Args... >;
+	};
 
 	template <typename F>
 	struct default_converter<F, typename std::enable_if<detail::is_function<remove_const_reference_t<F>>::value>::type>
diff --git a/libs/luabind/luabind/detail/push_to_lua.hpp b/libs/luabind/luabind/detail/push_to_lua.hpp
index 22ad8534f..8bb2e646a 100644
--- a/libs/luabind/luabind/detail/push_to_lua.hpp
+++ b/libs/luabind/luabind/detail/push_to_lua.hpp
@@ -26,6 +26,7 @@
 
 #include <luabind/config.hpp>
 #include <luabind/detail/policy.hpp>
+#include <luabind/detail/type_traits.hpp>
 
 namespace luabind {
 
diff --git a/libs/luabind/luabind/lua_index_proxy.hpp b/libs/luabind/luabind/lua_index_proxy.hpp
index f8c726de1..c62314f91 100644
--- a/libs/luabind/luabind/lua_index_proxy.hpp
+++ b/libs/luabind/luabind/lua_index_proxy.hpp
@@ -72,7 +72,7 @@ namespace luabind {
 				detail::stack_pop pop(m_interpreter, 1);
 
 				lua_pushvalue(m_interpreter, m_key_index);
-				detail::push(m_interpreter, value);
+				detail::push_to_lua(m_interpreter, value);
 				lua_settable(m_interpreter, -3);
 				return *this;
 			}