Fix for build break and DnsEndPoint duplication