Fix event subscriptions in lieu of Core API changes