Fix host specifics