Changed some services and sockets