more pubsub tweaks