Fix Worldsocket after merge