Completed broadcast source fixes