Some minor updates for account manager.