diff --git a/src/ecparam/clu_ecparam.c b/src/ecparam/clu_ecparam.c
index e7657fe8..a644ea4a 100644
--- a/src/ecparam/clu_ecparam.c
+++ b/src/ecparam/clu_ecparam.c
@@ -154,7 +154,7 @@ int wolfCLU_ecparam(int argc, char** argv)
 
                 /* convert name to upper case */
                 for (i = 0; i < (int)XSTRLEN(name); i++)
-                    (void)toupper(name[i]);
+                    name[i] = (char)toupper((unsigned char)name[i]);
 
                 #if 0
                 /* way to get the key size if needed in the future */
diff --git a/src/genkey/clu_genkey_setup.c b/src/genkey/clu_genkey_setup.c
index 47fecc5b..a104c05a 100644
--- a/src/genkey/clu_genkey_setup.c
+++ b/src/genkey/clu_genkey_setup.c
@@ -165,7 +165,7 @@ int wolfCLU_genKeySetup(int argc, char** argv)
 
                 /* convert name to upper case */
                 for (i = 0; i < (int)XSTRLEN(name); i++)
-                    (void)toupper(name[i]);
+                    name[i] = (char)toupper((unsigned char)name[i]);
             }
         }
 
@@ -501,7 +501,7 @@ int wolfCLU_genKeySetup(int argc, char** argv)
                     }
                     else {
                         WOLFCLU_LOG(WOLFCLU_L0, "Invalid -layer (%s), using 2", argv[ret+1]);
-                        XMEMCPY(xmssmtParam + xmssmtHeadLen, "40/2_25\0", hdLen);
+                        XMEMCPY(xmssmtParam + xmssmtHeadLen, "40/2_256\0", hdLen);
                     }
                     break;
                 case 60:
@@ -509,7 +509,7 @@ int wolfCLU_genKeySetup(int argc, char** argv)
                         XMEMCPY(xmssmtParam + xmssmtHeadLen, "60/3_256\0", hdLen);
                     }
                     else if (XSTRNCMP(argv[ret+1], "6", 1) == 0) {
-                        XMEMCPY(xmssmtParam + xmssmtHeadLen, "60/8_256\0", hdLen);
+                        XMEMCPY(xmssmtParam + xmssmtHeadLen, "60/6_256\0", hdLen);
                     }
                     else if (XSTRNCMP(argv[ret+1], "12", 2) == 0) {
                         XMEMCPY(xmssmtParam + xmssmtHeadLen, "60/12_256\0", hdLen+1);