PEP/PubSub fixes