diff --git a/sol/function_types.hpp b/sol/function_types.hpp
index 4ce3242e..702959e2 100644
--- a/sol/function_types.hpp
+++ b/sol/function_types.hpp
@@ -313,14 +313,16 @@ namespace sol {
 		template <typename... Functions>
 		struct pusher<overload_set<Functions...>> {
 			static int push(lua_State* L, overload_set<Functions...>&& set) {
+				// TODO: yielding
 				typedef function_detail::overloaded_function<0, Functions...> F;
-				pusher<function_sig<>>{}.set_fx<F>(L, std::move(set.functions));
+				pusher<function_sig<>>{}.set_fx<false, F>(L, std::move(set.functions));
 				return 1;
 			}
 
 			static int push(lua_State* L, const overload_set<Functions...>& set) {
+				// TODO: yielding
 				typedef function_detail::overloaded_function<0, Functions...> F;
-				pusher<function_sig<>>{}.set_fx<F>(L, set.functions);
+				pusher<function_sig<>>{}.set_fx<false, F>(L, set.functions);
 				return 1;
 			}
 		};
diff --git a/sol/function_types_stateful.hpp b/sol/function_types_stateful.hpp
index dc1e2eb6..2e54636f 100644
--- a/sol/function_types_stateful.hpp
+++ b/sol/function_types_stateful.hpp
@@ -104,10 +104,13 @@ namespace function_detail {
 				switch (lua_gettop(L)) {
 				case 0:
 					nr = call_detail::call_wrapped<T, true, false, -1>(L, var, mem);
+					break;
 				case 1:
 					nr = call_detail::call_wrapped<T, false, false, -1>(L, var, mem);
+					break;
 				default:
 					nr = luaL_error(L, "sol: incorrect number of arguments to member variable function");
+					break;
 				}
 			}
 			if (is_yielding) {