Fixes event handling given Event model updates