Fix event types