pubsub fixes