Fixed: various event-related functionality