Fixed ipv6 issues