Events issues fixed