bug fixes for broadcast workflow