Fix events handlers