More fixes and tweaks to account systems