Fixes for event bus reply handling