message bus fixes and diagnostics