diff --git a/crypto/pkcs12/pkcs12-create-example.c b/crypto/pkcs12/pkcs12-create-example.c
index e117be62..dc8d920a 100644
--- a/crypto/pkcs12/pkcs12-create-example.c
+++ b/crypto/pkcs12/pkcs12-create-example.c
@@ -152,9 +152,8 @@ static int loadKey(byte** keyDer, word32* keySz, RsaKey* key, const char* f)
         printf("return from loading in private key = %d\n", ret);
     }
 
-    if (*keySz < 0) {
+    if (ret < 0) {
         printf("unable to decode private key\n");
-        ret = *keySz;
     }
 
     return ret;
diff --git a/dtls/client-dtls-export.c b/dtls/client-dtls-export.c
index 4f8604f3..2cdc4b5e 100644
--- a/dtls/client-dtls-export.c
+++ b/dtls/client-dtls-export.c
@@ -141,7 +141,7 @@ int main(int argc, char** argv)
 
     /* First call to get required buffer size */
     ret = wolfSSL_dtls_export(ssl, NULL, &sessionSz);
-    if (ret < 0 || sessionSz == 0) {
+    if (ret != 0 && sessionSz == 0) {
         fprintf(stderr, "Error: wolfSSL_dtls_export (get size) failed: %d\n",
                 ret);
         ret = 1;
diff --git a/dtls/server-dtls-export.c b/dtls/server-dtls-export.c
index 2f4bd9f7..857e00d9 100644
--- a/dtls/server-dtls-export.c
+++ b/dtls/server-dtls-export.c
@@ -210,7 +210,7 @@ int main(int argc, char** argv)
 
     /* First call to get required buffer size */
     ret = wolfSSL_dtls_export(ssl, NULL, &sessionSz);
-    if (ret < 0 || sessionSz == 0) {
+    if (ret != 0 && sessionSz == 0) {
         fprintf(stderr, "Error: wolfSSL_dtls_export (get size) failed: %d\n",
                 ret);
         ret = 1;
diff --git a/pk/dh-pg/dh-pg-ka.c b/pk/dh-pg/dh-pg-ka.c
index 35567656..95a1bf1b 100644
--- a/pk/dh-pg/dh-pg-ka.c
+++ b/pk/dh-pg/dh-pg-ka.c
@@ -433,7 +433,7 @@ int main(int argc, char *argv[])
 
     /* Free allocated items */
     wc_FreeDhKey(&key1);
-    wc_FreeDhKey(&key1);
+    wc_FreeDhKey(&key2);
     wc_FreeRng(&rng);
 
     return 0;
diff --git a/tls/client-ech.c b/tls/client-ech.c
index 22e7c5bc..26fb43f7 100644
--- a/tls/client-ech.c
+++ b/tls/client-ech.c
@@ -237,7 +237,6 @@ int main(void)
 
     /* Write the message that will ask the server for information on the
      * connection */
-    wolfSSL_write(ssl, message, strlen(message));
     if ((ret = wolfSSL_write(ssl, message, strlen(message))) !=
             strlen(message)) {
         fprintf(stderr, "ERROR: failed to write entire message\n");
diff --git a/uefi-library/src/utility_wolf.c b/uefi-library/src/utility_wolf.c
index 32e13367..5794be59 100644
--- a/uefi-library/src/utility_wolf.c
+++ b/uefi-library/src/utility_wolf.c
@@ -730,7 +730,7 @@ long ftell(FILE* stream)
     fPtr = (EFI_FILE_HANDLE*)stream;
 
     fSize = fileSize(*(fPtr));
-    if (fileSize == 0) {
+    if (fSize == 0) {
         uefi_printf_wolfssl("File is of size 0\n");
         return 0;
     }
@@ -756,7 +756,7 @@ size_t fread(void* ptr, size_t size, size_t count, FILE* stream)
     fPtr = (EFI_FILE_HANDLE*)stream;
 
     fSize = fileSize(*(fPtr));
-    if (fileSize == 0) {
+    if (fSize == 0) {
         uefi_printf_wolfssl("File is of size 0\n");
         return 0;
     }
@@ -1103,8 +1103,9 @@ struct dirent* readdir(DIR* stream)
     }
 
     fSize = fileSize(*(fPtr));
-    if (fileSize == 0) {
+    if (fSize == 0) {
         uefi_printf_wolfssl("File is of size 0\n");
+        XFREE(dirPtr, NULL, DYNAMIC_TYPE_TMP_BUFFER);
         return 0;
     }