diff --git a/packages/lib/AsyncActionQueue.ts b/packages/lib/AsyncActionQueue.ts
index 21349cd4f..7a6e289f5 100644
--- a/packages/lib/AsyncActionQueue.ts
+++ b/packages/lib/AsyncActionQueue.ts
@@ -103,7 +103,7 @@ export default class AsyncActionQueue {
 
 				if (!this.queue_.length) {
 					shim.clearInterval(iid);
-					resolve();
+					resolve(null);
 				}
 			}, 100);
 		});
diff --git a/packages/lib/services/keychain/KeychainServiceDriverBase.ts b/packages/lib/services/keychain/KeychainServiceDriverBase.ts
index 452194b96..004eb9650 100644
--- a/packages/lib/services/keychain/KeychainServiceDriverBase.ts
+++ b/packages/lib/services/keychain/KeychainServiceDriverBase.ts
@@ -16,9 +16,9 @@ abstract class KeychainServiceDriverBase {
 		return this.clientId_;
 	}
 
-	abstract async setPassword(name: string, password: string): Promise<boolean>;
-	abstract async password(name: string): Promise<string>;
-	abstract async deletePassword(name: string): Promise<void>;
+	abstract setPassword(name: string, password: string): Promise<boolean>;
+	abstract password(name: string): Promise<string>;
+	abstract deletePassword(name: string): Promise<void>;
 
 }