Fix many account issues