More potential fixes

Still having issues with broadcast.emit.