HI: Some small changes for events