Fix fqdn setting issues