Hotfix: Added missing dependencies; temp bandage for events.

## Ready State: Yes