Tweaks for IPv6 support