tenant_class access fixes