More fixes for socket.io