more changes for IPv6 client support