Minor updates to support tenants