diff --git a/src/models/response/globalDomainResponse.ts b/src/models/response/globalDomainResponse.ts
index 5f37c7e625..861282a92a 100644
--- a/src/models/response/globalDomainResponse.ts
+++ b/src/models/response/globalDomainResponse.ts
@@ -3,7 +3,7 @@ import { BaseResponse } from './baseResponse';
 export class GlobalDomainResponse extends BaseResponse {
     type: number;
     domains: string[];
-    excluded: number[];
+    excluded: boolean;
 
     constructor(response: any) {
         super(response);
diff --git a/src/models/view/loginUriView.ts b/src/models/view/loginUriView.ts
index 1d51561c11..4e171ad967 100644
--- a/src/models/view/loginUriView.ts
+++ b/src/models/view/loginUriView.ts
@@ -15,6 +15,8 @@ const CanLaunchWhitelist = [
     'irc://',
     'vnc://',
     'chrome://',
+    'iosapp://',
+    'androidapp://',
 ];
 
 export class LoginUriView implements View {
diff --git a/src/services/cipher.service.ts b/src/services/cipher.service.ts
index 3c86989d0f..87bd575d27 100644
--- a/src/services/cipher.service.ts
+++ b/src/services/cipher.service.ts
@@ -598,7 +598,7 @@ export class CipherService implements CipherServiceAbstraction {
         const userId = await this.userService.getUserId();
         const cData = new CipherData(response, userId, cipher.collectionIds);
         if (!admin) {
-            this.upsert(cData);
+            await this.upsert(cData);
         }
         return new Cipher(cData);
     }
@@ -728,14 +728,15 @@ export class CipherService implements CipherServiceAbstraction {
         const aLastUsed = a.localData && a.localData.lastUsedDate ? a.localData.lastUsedDate as number : null;
         const bLastUsed = b.localData && b.localData.lastUsedDate ? b.localData.lastUsedDate as number : null;
 
-        if (aLastUsed != null && bLastUsed != null && aLastUsed < bLastUsed) {
+        const bothNotNull = aLastUsed != null && bLastUsed != null;
+        if (bothNotNull && aLastUsed < bLastUsed) {
             return 1;
         }
         if (aLastUsed != null && bLastUsed == null) {
             return -1;
         }
 
-        if (bLastUsed != null && aLastUsed != null && aLastUsed > bLastUsed) {
+        if (bothNotNull && aLastUsed > bLastUsed) {
             return -1;
         }
         if (bLastUsed != null && aLastUsed == null) {