Fix broadcast messages