Minor host fix for multi tenancy