Fix some FQDN vars