A couple changes to sockets