Small broadcast fixes