Quick fixes for event types