diff --git a/cyassl/ssl.h b/cyassl/ssl.h
index 0b4d4e479..765872f50 100644
--- a/cyassl/ssl.h
+++ b/cyassl/ssl.h
@@ -58,8 +58,8 @@
 #define CYASSL_BIO                WOLFSSL_BIO
 #define CYASSL_CIPHER             WOLFSSL_CIPHER
 #define CYASSL_MD4_CTX            WOLFSSL_MD4_CTX
-#define CYASSL_MFL_2_9            WOLFSSL_MFL_2_9
-#define CYASSL_MFL_2_13           WOLFSSL_MFL_2_13
+#define CYASSL_MFL_2_9            WOLFSSL_MFL_2_9 /**/
+#define CYASSL_MFL_2_13           WOLFSSL_MFL_2_13 /**/
 #define CYASSL_EVP_PKEY           WOLFSSL_EVP_PKEY
 #define CYASSL_X509_CRL           WOLFSSL_X509_CRL
 #define CYASSL_ASN1_TIME          WOLFSSL_ASN1_TIME
@@ -154,9 +154,7 @@
 #define cyassl_chacha                  wolfssl_chacha
 #define CyaSSL_ERR_reason_error_string wolfSSL_ERR_reason_error_string
 
-//#define wolfcrypt_test                 ctaocrypt_test
-
-/* src/eys.c */
+/* src/keys.c */
 #define cyassl_triple_des wolfssl_triple_des
 
 /* Initialization and Shutdown */
@@ -270,6 +268,9 @@
 #define CyaSSL_CTX_set_psk_server_callback \
                                       wolfSSL_CTX_set_psk_server_callback /**/
 
+/* Anonymous */
+#define CyaSSL_CTX_allow_anon_cipher wolfSSL_CTX_allow_anon_cipher
+
 /* Error Handling and Debugging*/
 #define CyaSSL_get_error           wolfSSL_get_error
 #define CyaSSL_want_read           wolfSSL_want_read
diff --git a/src/internal.c b/src/internal.c
index 01e6970d5..04a68542a 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -1499,7 +1499,9 @@ int InitSSL(WOLFSSL* ssl, WOLFSSL_CTX* ctx)
     int  ret;
     byte haveRSA = 0;
     byte havePSK = 0;
+#ifdef HAVE_ANON 
     byte haveAnon = 0;
+#endif
 
     ssl->ctx     = ctx; /* only for passing to calls, options could change */
     ssl->version = ctx->method->version;
@@ -1886,7 +1888,11 @@ int InitSSL(WOLFSSL* ssl, WOLFSSL_CTX* ctx)
 #endif
 #ifndef NO_CERTS
     /* make sure server has cert and key unless using PSK or Anon */
-    if (ssl->options.side == WOLFSSL_SERVER_END && !havePSK && !haveAnon)
+    if (ssl->options.side == WOLFSSL_SERVER_END && !havePSK 
+						#ifdef HAVE_ANON
+						&& !haveAnon
+						#endif
+						)
         if (!ssl->buffers.certificate.buffer || !ssl->buffers.key.buffer) {
             WOLFSSL_MSG("Server missing certificate and/or private key");
             return NO_PRIVATE_KEY;
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 80f3f0506..930d7690e 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -6088,7 +6088,7 @@ int wc_MakeSelfCert(Cert* cert, byte* buffer, word32 buffSz, RsaKey* key, RNG* r
 #ifdef WOLFSSL_ALT_NAMES 
 
 /* Set Alt Names from der cert, return 0 on success */
-static int wc_SetAltNamesFromCert(Cert* cert, const byte* der, int derSz)
+static int SetAltNamesFromCert(Cert* cert, const byte* der, int derSz)
 {
     int ret;
 #ifdef WOLFSSL_SMALL_STACK
@@ -6388,7 +6388,7 @@ int wc_SetAltNames(Cert* cert, const char* file)
         return MEMORY_E;
     }
     derSz = wolfSSL_PemCertToDer(file, der, EIGHTK_BUF);
-    ret = wc_SetAltNamesFromCert(cert, der, derSz);
+    ret = SetAltNamesFromCert(cert, der, derSz);
     XFREE(der, NULL, DYNAMIC_TYPE_CERT);
 
     return ret;
@@ -6418,7 +6418,7 @@ int wc_SetSubjectBuffer(Cert* cert, const byte* der, int derSz)
 /* Set cert alt names from DER buffer */
 int wc_SetAltNamesBuffer(Cert* cert, const byte* der, int derSz)
 {
-    return wc_SetAltNamesFromCert(cert, der, derSz);
+    return SetAltNamesFromCert(cert, der, derSz);
 }
 
 /* Set cert dates from DER buffer */