Fixed event errors