Multi tenancy assorted fixes.