More socket address fixes