Fix events a bit