Fix DNS names and IP addrs