Fixing multi-tenant plugin changes