More fixes related to multi-tenant stat-keeping.