Fix event bus dependencies;