Minor composite and pubsub updates