broadcaster fixes