Improve unix-sock implementation