Fix events errors