Fix host list construction