More changes to event handling