Last changes on the sockets