some multi host fixes