Even more changes on sockets