EventController fixes