More socket.io bugfixes