more fixes on broadcasting