fix location and hostnames