diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index c36a80531e..fc240a98c5 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -133,7 +133,7 @@ Sockets.init = function() {
 
 		socket.on('*', function(payload, callback) {
 			function callMethod(method) {
-				method.call(socket, args[0]?args[0]:null, function(err, result) {
+				method.call(null, socket, payload.args.length ? payload.args[0] : null, function(err, result) {
 					if(callback) {
 						callback(err?{message:err.message}:null, result);
 					}
diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js
index 2a44d0b5fe..52cbae9f74 100644
--- a/src/socket.io/meta.js
+++ b/src/socket.io/meta.js
@@ -7,6 +7,7 @@ var	meta = require('../meta'),
 	nconf = require('nconf'),
 	gravatar = require('gravatar'),
 	winston = require('winston'),
+	server = require('./'),
 
 	SocketMeta = {};
 
@@ -71,13 +72,13 @@ SocketMeta.rooms.enter = function(socket, data) {
 	}
 
 	socket.join(data.enter);
-	socket.rooms[data.enter] = socket.rooms[data.enter] || {};
+	server.rooms[data.enter] = server.rooms[data.enter] || {};
 
 	if (socket.uid) {
-		socket.rooms[data.enter][socket.id] = socket.uid;
+		server.rooms[data.enter][socket.id] = socket.uid;
 
-		if (data.leave && socket.rooms[data.leave] && socket.rooms[data.leave][socket.id] && data.enter !== data.leave) {
-			delete socket.rooms[data.leave][socket.id];
+		if (data.leave && server.rooms[data.leave] && server.rooms[data.leave][socket.id] && data.enter !== data.leave) {
+			delete server.rooms[data.leave][socket.id];
 		}
 	}
 
@@ -88,12 +89,12 @@ SocketMeta.rooms.enter = function(socket, data) {
 	module.parent.exports.updateRoomBrowsingText(data.enter);
 
 	if (data.enter != 'admin') {
-		socket.server.sockets.in('admin').emit('event:meta.rooms.update', socket.server.sockets.manager.rooms);
+		server.in('admin').emit('event:meta.rooms.update', socket.manager.rooms);
 	}
 };
 
 SocketMeta.rooms.getAll = function(socket, data, callback) {
-	callback(socket.server.sockets.manager.rooms);
+	callback(server.manager.rooms);
 };
 
 /* Exports */