Fix up broadcasting