diff --git a/buildconf/luap.ini b/buildconf/luap.ini
index 13826998..80b7e844 100644
--- a/buildconf/luap.ini
+++ b/buildconf/luap.ini
@@ -1,4 +1,3 @@
 [uwsgi]
 inherit = default
 plugins = lua
-embedded_plugins = ping, nagios, rpc
diff --git a/buildconf/psgi.ini b/buildconf/psgi.ini
index 1cfedfd4..cd243ce2 100644
--- a/buildconf/psgi.ini
+++ b/buildconf/psgi.ini
@@ -1,3 +1,3 @@
 [uwsgi]
 inherit = default
-embedded_plugins = psgi, ping, proxy, nagios, rpc
+embedded_plugins = psgi
diff --git a/plugins/lua/lua_plugin.c b/plugins/lua/lua_plugin.c
index be08fcdf..0073f460 100644
--- a/plugins/lua/lua_plugin.c
+++ b/plugins/lua/lua_plugin.c
@@ -153,7 +153,7 @@ static int uwsgi_api_cache_set(lua_State *L) {
 			expires = lua_tonumber(L, 3);
 		}
 
-        	uwsgi_cache_set((char *)key, strlen(key), (char *)value, (uint16_t) vallen, expires);
+        	uwsgi_cache_set((char *)key, strlen(key), (char *)value, (uint16_t) vallen, expires, 0);
 		
 	}
 
@@ -176,7 +176,7 @@ static int uwsgi_api_register_signal(lua_State *L) {
 		lua_pushvalue(L, 3);
 		lhandler = luaL_ref(L, LUA_REGISTRYINDEX);
 
-		uwsgi_register_signal(sig, kind, (void *) lhandler, 6);
+		uwsgi_register_signal(sig, (char *)who, (void *) lhandler, 6);
 	}
 
 	lua_pushnil(L);
@@ -187,7 +187,7 @@ static int uwsgi_api_register_signal(lua_State *L) {
 static int uwsgi_api_cache_get(lua_State *L) {
 
         char *value ;
-        uint16_t valsize;
+        uint64_t valsize;
 	const char *key ;
 
         lca(L, 1);
@@ -601,15 +601,8 @@ int uwsgi_lua_signal_handler(uint8_t sig, void *handler) {
 	lua_rawgeti(L, LUA_REGISTRYINDEX, (long) handler);
 
 	lua_pushnumber(L, sig);
-	if (!payload_size) {
-		lua_pushlstring(L, "", 0);
-	}
-	else {
-		lua_pushlstring(L, payload, payload_size);
-	}
 
-
-	if (lua_pcall(L, 2, 1, 0) != 0) {
+	if (lua_pcall(L, 1, 1, 0) != 0) {
 		uwsgi_log("error running function `f': %s",
                  lua_tostring(L, -1));
 
diff --git a/plugins/psgi/uwsgi_plmodule.c b/plugins/psgi/uwsgi_plmodule.c
index 64c4dea9..742ea3ca 100644
--- a/plugins/psgi/uwsgi_plmodule.c
+++ b/plugins/psgi/uwsgi_plmodule.c
@@ -29,7 +29,7 @@ XS(XS_cache_set) {
 	key = SvPV(ST(0), keylen);
 	val = SvPV(ST(1), vallen);
 
-	uwsgi_cache_set(key, (uint16_t) keylen, val, (uint16_t) vallen, 0);
+	uwsgi_cache_set(key, (uint16_t) keylen, val, (uint64_t) vallen, 0, 0);
 
 	XSRETURN_UNDEF;
 }
@@ -39,7 +39,7 @@ XS(XS_cache_get) {
 
 	char *key, *val;
 	STRLEN keylen;
-	uint16_t vallen;
+	uint64_t vallen;
 	
 	psgi_check_args(1);