Adding some more intelligence about virt FQDNs