diff --git a/src/ssl.c b/src/ssl.c
index f47759df5..0aa611b53 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -24153,7 +24153,7 @@ int wolfSSL_sk_CIPHER_description(WOLFSSL_CIPHER* cipher)
     const char* name;
     const char *keaStr, *authStr, *encStr, *macStr, *protocol;
     char n[MAX_SEGMENTS][MAX_SEGMENT_SZ] = {{0}};
-    uint8_t len = MAX_DESCRIPTION_SZ-1;
+    unsigned char len = MAX_DESCRIPTION_SZ-1;
     const CipherSuiteInfo* cipher_names;
     ProtocolVersion pv;
     WOLFSSL_ENTER("wolfSSL_sk_CIPHER_description");
@@ -36380,7 +36380,7 @@ size_t wolfSSL_EC_get_builtin_curves(WOLFSSL_EC_BUILTIN_CURVE *r, size_t nitems)
     size_t ecc_sets_count;
     size_t i, min_nitems;
 
-    for (i = 0; ecc_sets[i].size != 0 && ecc_sets[i].name != NULL; i++);
+    for (i = 0; ecc_sets[i].size != 0; i++);
     ecc_sets_count = i;
 
     if (r == NULL || nitems == 0)
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 62ca85ea7..9810df293 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -5470,7 +5470,7 @@ int wc_OBJ_sn2nid(const char *sn)
     if (XSTRNCMP(sn, "secp384r1", 10) == 0)
         sn = "SECP384R1";
     /* find based on name and return NID */
-    for (i = 0; ecc_sets[i].size != 0 && ecc_sets[i].name != NULL; i++) {
+    for (i = 0; ecc_sets[i].size != 0; i++) {
         if (XSTRNCMP(sn, ecc_sets[i].name, ECC_MAXNAME) == 0) {
             eccEnum = ecc_sets[i].id;
             /* Convert enum value in ecc_curve_id to OpenSSL NID */