Fix some Event classes mistakes