Fixed some Event stuff