diff --git a/src/libs/webauthn.mts b/src/libs/webauthn.mts
index 187e7d7..0af6fd4 100644
--- a/src/libs/webauthn.mts
+++ b/src/libs/webauthn.mts
@@ -61,7 +61,7 @@ export const getOrigin = (
   let origin = _origin;
   if (!userAgent) return origin;
 
-  const appRe = /^[a-zA-z0-9_.]+/;
+  const appRe = /^[a-zA-Z0-9_.]+/;
   const match = userAgent.match(appRe);
   if (match) {
     // Check if UserAgent comes from a supported Android app.
diff --git a/src/public/scripts/main.ts b/src/public/scripts/main.ts
index 4349bc9..5debb75 100644
--- a/src/public/scripts/main.ts
+++ b/src/public/scripts/main.ts
@@ -379,7 +379,7 @@ async function parseAuthData(
     // Decode AAGUID
     let AAGUID = buffer.slice(0, 16);
     AAGUID = Array.from(AAGUID).map(a => (<Number>a).toString(16).padStart(2, '0'));
-    authData.aaguid = `${AAGUID.splice(0,4).join('')}-${AAGUID.splice(0,2).join('')}-${AAGUID.splice(0,2).join('')}-${AAGUID.splice(0).join('')}`;
+    authData.aaguid = `${AAGUID.splice(0,4).join('')}-${AAGUID.splice(0,2).join('')}-${AAGUID.splice(0,2).join('')}-${AAGUID.splice(0,2).join('')}-${AAGUID.splice(0).join('')}`;
     buffer = buffer.slice(16);
 
     const credIDLenBuf = buffer.slice(0, 2);
@@ -504,9 +504,9 @@ const listCredentials = async (): Promise<void> => {
             <dd>${(new Date(cred.registered)).toLocaleString()}</dd>`:''}
             ${extensions?.credProps ? html`
             <dt>Credential Properties Extension</dt>`:''}
-            ${extensions.credProps?.rk ? html`
+            ${extensions?.credProps?.rk ? html`
             <dd>Discoverable Credentials: ${extensions.credProps.rk?'true':'false'}</dd>`:''}
-            ${extensions.credProps?.authenticatorDisplayName ? html`
+            ${extensions?.credProps?.authenticatorDisplayName ? html`
             <dd>Authenticator display name: ${extensions.credProps.authenticatorDisplayName}</dd>`:''}
             <dt>Public Key</dt>
             <dd>${cred.credentialPublicKey}</dd>
diff --git a/src/templates/index.html b/src/templates/index.html
index f169f6b..8b5decd 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -37,7 +37,7 @@
       type="url"
       label="Picture URL"
       pattern="^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.?[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)$"
-      id="picture-url"></mwc-textfieldtype=>
+      id="picture-url"></mwc-textfield>
   </div>
   <mwc-button
     slot="secondaryAction"