Apply Virgo improvements on TrustEventMgr