Added some save/restore calls
Fix stringifying broadcasts