fix AccountManager and RecordManager