diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index e014736128..65c3ed7464 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -1250,14 +1250,14 @@
   "yourVaultIsLockedPinCode": {
     "message": "Your vault is locked. Verify your PIN code to continue."
   },
-  "unlockWithBiometric": {
-    "message": "Unlock with biometric"
+  "unlockWithBiometrics": {
+    "message": "Unlock with biometrics"
   },
   "awaitDesktop": {
     "message": "Awaiting confirmation from desktop"
   },
   "awaitDesktopDesc": {
-    "message": "Please confirm using biometrics in the Bitwarden desktop application to enable biometrics for browser."
+    "message": "Please confirm using biometrics in the Bitwarden Desktop application to enable biometrics for browser."
   },
   "lockWithMasterPassOnRestart": {
     "message": "Lock with master password on browser restart"
@@ -1391,19 +1391,19 @@
     "message": "Browser integration is not enabled"
   },
   "desktopIntegrationDisabledDesc": {
-    "message": "Browser integration is not enabled in the Bitwarden Desktop Application. Please enable it in the settings within the desktop application."
+    "message": "Browser integration is not enabled in the Bitwarden Desktop application. Please enable it in the settings within the desktop application."
   },
   "startDesktopTitle": {
-    "message": "Start the Bitwarden Desktop Application"
+    "message": "Start the Bitwarden Desktop application"
   },
   "startDesktopDesc": {
-    "message": "The bitwarden desktop application needs to be started before this function can be used."
+    "message": "The Bitwarden Desktop application needs to be started before this function can be used."
   },
   "errorEnableBiometricTitle": {
     "message": "Unable to enable biometrics"
   },
   "errorEnableBiometricDesc": {
-    "message": "Action was canceld by the desktop applicaiton."
+    "message": "Action was canceled by the desktop application"
   },
   "nativeMessagingInvalidEncryptionDesc": {
     "message": "Desktop application invalidated the secure communication channel. Please retry this operation"
diff --git a/src/background/nativeMessaging.background.ts b/src/background/nativeMessaging.background.ts
index 92cb691bdb..6e572d93e0 100644
--- a/src/background/nativeMessaging.background.ts
+++ b/src/background/nativeMessaging.background.ts
@@ -66,7 +66,7 @@ export class NativeMessagingBackground {
                         this.sharedSecret = null;
                         this.privateKey = null;
                         this.connected = false;
-                        
+
                         this.messagingService.send('showDialog', {
                             text: this.i18nService.t('nativeMessagingInvalidEncryptionDesc'),
                             title: this.i18nService.t('nativeMessagingInvalidEncryptionTitle'),
@@ -86,7 +86,9 @@ export class NativeMessagingBackground {
                     error = chrome.runtime.lastError.message;
                 }
 
-                if (error === 'Specified native messaging host not found.' || error === 'Access to the specified native messaging host is forbidden.' || error === 'An unexpected error occurred') {
+                if (error === 'Specified native messaging host not found.' ||
+                    error === 'Access to the specified native messaging host is forbidden.' ||
+                    error === 'An unexpected error occurred') {
                     this.messagingService.send('showDialog', {
                         text: this.i18nService.t('desktopIntegrationDisabledDesc'),
                         title: this.i18nService.t('desktopIntegrationDisabledTitle'),
@@ -157,7 +159,7 @@ export class NativeMessagingBackground {
                 break;
             default:
                 // tslint:disable-next-line
-                console.error('NativeMessage, got unknown command.');
+                console.error('NativeMessage, got unknown command: ', message.command);
         }
 
         if (this.resolver) {
diff --git a/src/popup/accounts/lock.component.html b/src/popup/accounts/lock.component.html
index 773cc20d49..1a40769500 100644
--- a/src/popup/accounts/lock.component.html
+++ b/src/popup/accounts/lock.component.html
@@ -38,7 +38,7 @@
         </div>
         <div class="box" *ngIf="biometricLock">
             <div class="box-footer">
-                <a class="btn primary block" (click)="unlockBiometric()">Unlock with biometry</a>
+                <a class="btn primary block" (click)="unlockBiometric()">{{'unlockWithBiometrics' | i18n}}</a>
             </div>
         </div>
         <p class="text-center">
diff --git a/src/popup/settings/settings.component.html b/src/popup/settings/settings.component.html
index 9392db801d..42f3287792 100644
--- a/src/popup/settings/settings.component.html
+++ b/src/popup/settings/settings.component.html
@@ -43,7 +43,7 @@
                 <input id="pin" type="checkbox" (change)="updatePin()" [(ngModel)]="pin">
             </div>
             <div class="box-content-row box-content-row-checkbox" appBoxRow>
-                <label for="biometric">{{'unlockWithBiometric' | i18n}}</label>
+                <label for="biometric">{{'unlockWithBiometrics' | i18n}}</label>
                 <input id="biometric" type="checkbox" (change)="updateBiometric()" [checked]="biometric">
             </div>
             <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick