event_publisher fixes