Small changes for BroadcastTextID builder