Fix servername where fqdn is not available