[fix] Cleaning up some code in broadcast
[fix] Re-add roomserror change