more ipv6 fixes