Host ipv4 and ipv6 fixes
Disclose of contact TODO