some fixes when broadcasting msgs