Fix host handlers