JS Fixes for broadcast module