diff --git a/configure.ac b/configure.ac
index 80eccb290..d6b87c4f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 #
 #
 
-AC_INIT([cyassl],[2.0.0rc3d],[http://www.yassl.com])
+AC_INIT([cyassl],[2.0.1],[http://www.yassl.com])
 
 AC_CONFIG_AUX_DIR(config)
 
diff --git a/ctaocrypt/src/asn.c b/ctaocrypt/src/asn.c
index bb7c414e7..479c10f5b 100644
--- a/ctaocrypt/src/asn.c
+++ b/ctaocrypt/src/asn.c
@@ -927,7 +927,7 @@ int DhParamsLoad(const byte* input, word32 inSz, byte* p, word32* pInOutSz,
     else
         i--;
 
-    if (length <= *pInOutSz) {
+    if (length <= (int)*pInOutSz) {
         XMEMCPY(p, &input[i], length);
         *pInOutSz = length;
     }
@@ -943,7 +943,7 @@ int DhParamsLoad(const byte* input, word32 inSz, byte* p, word32* pInOutSz,
     if (GetLength(input, &i, &length, inSz) < 0)
         return ASN_PARSE_E;
 
-    if (length <= *gInOutSz) {
+    if (length <= (int)*gInOutSz) {
         XMEMCPY(g, &input[i], length);
         *gInOutSz = length;
     }
diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c
index 9cd43909d..e9c540d34 100644
--- a/examples/echoserver/echoserver.c
+++ b/examples/echoserver/echoserver.c
@@ -149,10 +149,10 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
         ssl = SSL_new(ctx);
         if (ssl == NULL) err_sys("SSL_new failed");
         SSL_set_fd(ssl, clientfd);
-        #ifdef NO_FILESYSTEM
-            SetDH(ssl);
-        #else
+        #if !defined(NO_FILESYSTEM) && defined(OPENSSL_EXTRA)
             CyaSSL_SetTmpDH_file(ssl, dhParam, SSL_FILETYPE_PEM);
+        #else
+            SetDH(ssl);  /* will repick suites with DHE, higher than PSK */
         #endif
         if (SSL_accept(ssl) != SSL_SUCCESS) {
             printf("SSL_accept failed\n");
diff --git a/examples/server/server.c b/examples/server/server.c
index 787b477fe..5c65ca517 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -150,10 +150,10 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
 
     SSL_set_fd(ssl, clientfd);
 #ifdef NO_PSK
-    #ifdef NO_FILESYSTEM
-        SetDH(ssl);  /* will repick suites with DHE, higher priority than PSK */
-    #else
+    #if !defined(NO_FILESYSTEM) && defined(OPENSSL_EXTRA)
         CyaSSL_SetTmpDH_file(ssl, dhParam, SSL_FILETYPE_PEM);
+    #else
+        SetDH(ssl);  /* will repick suites with DHE, higher priority than PSK */
     #endif
 #endif
 
diff --git a/src/ssl.c b/src/ssl.c
index 9b926d428..912fcde3e 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -1202,7 +1202,7 @@ static int CyaSSL_SetTmpDH_buffer_wrapper(CYASSL_CTX* ctx, CYASSL* ssl,
     word32 pSz = sizeof(p);
     word32 gSz = sizeof(g);
 
-    der.buffer = buf;
+    der.buffer = (byte*)buf;
     der.length = sz;
 
     if (format != SSL_FILETYPE_ASN1 && format != SSL_FILETYPE_PEM)