Fix event handlers and event store