pubsub small improvements