diff --git a/Applet/src/com/android/javacard/keymaster/KMByteTag.java b/Applet/src/com/android/javacard/keymaster/KMByteTag.java
index e33cc4db..b7b8decd 100644
--- a/Applet/src/com/android/javacard/keymaster/KMByteTag.java
+++ b/Applet/src/com/android/javacard/keymaster/KMByteTag.java
@@ -130,6 +130,6 @@ private static boolean validateKey(short key, short byteBlob) {
       default:
         return false;
     }
-    return result;
+    return true;
   }
 }
diff --git a/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java b/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
index 0eb32fe0..5171abde 100644
--- a/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
+++ b/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
@@ -1376,7 +1376,7 @@ private KMAttestationCert makeSelfSignedCert(short attPrivKey, short attPubKey,
       subject = KMByteTag.cast(subject).getValue();
     }
 
-    if (KMEnumTag.cast(alg).getValue() == KMType.RSA) {
+    if (alg == KMType.RSA) {
       cert.rsaAttestKey(attPrivKey, attPubKey, (byte) mode);
     } else {
       cert.ecAttestKey(attPrivKey, (byte) mode);