Fixed Events issues