Fix handlers not being found for events