Fix connect/broadcast interaction.