EventBus tweaks.