Fixed issues and sockets