Fix bugs in remove screen from broadcast