Fixing hostnames