Finish ripping out Account and fix a broadcast bug