broadcast fixes