Bugfixes with EventDispatcher not being global