diff --git a/src/ssl.c b/src/ssl.c
index 999a16d7e..4306e9a26 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -25750,7 +25750,7 @@ void wolfSSL_ASN1_GENERALIZEDTIME_free(WOLFSSL_ASN1_TIME* asn1Time)
     XMEMSET(asn1Time->data, 0, sizeof(asn1Time->data));
 }
 
-int  wolfSSL_sk_num(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)* sk)
+int wolfSSL_sk_num(WOLFSSL_STACK* sk)
 {
     WOLFSSL_ENTER("wolfSSL_sk_num");
     if (sk == NULL)
@@ -25758,7 +25758,7 @@ int  wolfSSL_sk_num(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)* sk)
     return (int)sk->num;
 }
 
-void* wolfSSL_sk_value(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)* sk, int i)
+void* wolfSSL_sk_value(WOLFSSL_STACK* sk, int i)
 {
     #if defined(OPENSSL_ALL) || defined(WOLFSSL_QT)
     int offset = i;
@@ -25772,9 +25772,9 @@ void* wolfSSL_sk_value(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)* sk, int i)
         return NULL;
 
     switch (sk->type) {
-    #if defined(OPENSSL_ALL) || defined(WOLFSSL_QT)
         case STACK_TYPE_X509:
             return (void*)sk->data.x509;
+    #if defined(OPENSSL_ALL) || defined(WOLFSSL_QT)
         case STACK_TYPE_CIPHER:
             if (sk->data.cipher == NULL)
                 return NULL;
@@ -25793,12 +25793,14 @@ void* wolfSSL_sk_value(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)* sk, int i)
             return (void*)gn;
         case STACK_TYPE_ACCESS_DESCRIPTION:
             return (void*)sk->data.access;
+    #endif
         case STACK_TYPE_OBJ:
             return (void*)sk->data.obj;
             break;
         case STACK_TYPE_NULL:
             return (void*)sk->data.generic;
             break;
+    #if defined(OPENSSL_ALL) || defined(WOLFSSL_QT)
         case STACK_TYPE_X509_EXT:
             return (void*)sk->data.ext;
     #endif
diff --git a/wolfssl/internal.h b/wolfssl/internal.h
index 7d3da06b1..93c7b8ad5 100644
--- a/wolfssl/internal.h
+++ b/wolfssl/internal.h
@@ -1865,16 +1865,13 @@ WOLFSSL_LOCAL int  SetCipherList(WOLFSSL_CTX*, Suites*, const char* list);
 #endif /* WOLFSSL_DTLS_EXPORT_TYPES */
 
 
-#if defined(OPENSSL_ALL) || defined(WOLFSSL_QT)
-#define UINT8_SZ 255
-#endif
 /* wolfSSL Cipher type just points back to SSL */
 struct WOLFSSL_CIPHER {
     byte cipherSuite0;
     byte cipherSuite;
     WOLFSSL* ssl;
 #if defined(OPENSSL_ALL) || defined(WOLFSSL_QT)
-    char description[UINT8_SZ];
+    char description[MAX_CIPHERNAME_SZ];
     unsigned long offset;
     unsigned int in_stack; /* TRUE if added to stack in wolfSSL_get_ciphers_compat */
     int bits;
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index dd4333af2..a26e60c31 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -1856,8 +1856,8 @@ WOLFSSL_API int wolfSSL_ASN1_TIME_diff(int *pday, int *psec,
                    const WOLFSSL_ASN1_TIME *from, const WOLFSSL_ASN1_TIME *to);
 WOLFSSL_API WOLFSSL_ASN1_TIME *wolfSSL_ASN1_TIME_set(WOLFSSL_ASN1_TIME *s, time_t t);
 
-WOLFSSL_API int   wolfSSL_sk_num(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)*);
-WOLFSSL_API void* wolfSSL_sk_value(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)*, int);
+WOLFSSL_API int wolfSSL_sk_num(WOLFSSL_STACK* sk);
+WOLFSSL_API void* wolfSSL_sk_value(WOLFSSL_STACK* sk, int i);
 
 /* stunnel 4.28 needs */
 WOLFSSL_API void* wolfSSL_CTX_get_ex_data(const WOLFSSL_CTX*, int);