Allows app and controllers to dispatch the same events.
Fixes some bugs