diff --git a/examples/client/client.c b/examples/client/client.c
index 6b048698b..0b2f22d6f 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -3077,15 +3077,16 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
 #endif /* HAVE_SECURE_RENEGOTIATION */
 
     if (sendGET) {
-        printf("SSL connect ok, sending GET...\n");
         char msgGet[GETMSGSZ] = "GET /index.html HTTP/1.0\r\n\r\n";
+        printf("SSL connect ok, sending GET...\n");
+
         XMEMSET(msg, 0, MSG32);
         XMEMSET(resumeMsg, 0, MSG32);
         msgSz = GETMSGSZ-1;
-        XSTRNCPY(msg, msgGet, msgSz);
+        XMEMCPY(msg, msgGet, msgSz);
 
         resumeSz = msgSz;
-        XSTRNCPY(resumeMsg, msgGet, resumeSz);
+        XMEMCPY(resumeMsg, msgGet, resumeSz);
     }
 
 /* allow some time for exporting the session */
diff --git a/examples/server/server.c b/examples/server/server.c
index aea9ec29b..640858422 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -2404,11 +2404,11 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
             /* Write data */
             if (!useWebServerMsg) {
                 write_msg = msg;
-                write_msg_sz = XSTRLEN(msg);
+                write_msg_sz = (int) XSTRLEN(msg);
             }
             else {
                 write_msg = webServerMsg;
-                write_msg_sz = XSTRLEN(webServerMsg);
+                write_msg_sz = (int) XSTRLEN(webServerMsg);
             }
             ServerWrite(ssl, write_msg, write_msg_sz);