AccountManager fixes