Fix hostnames