Fixing hostnames to fill in properly