setupPubSub fixes