minor pubsub fixes