Fix issues introduced by ip6 changes