Minor changes to the event system