Fix events to use core's simple event