Fix issues with Events.