Fixes for publish/subscribe