diff --git a/src/internal.c b/src/internal.c
index 81710b0a4..38f43c619 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -1873,10 +1873,10 @@ int InitSSL_Ctx(WOLFSSL_CTX* ctx, WOLFSSL_METHOD* method, void* heap)
     ctx->noPskDheKe = 1;
 #endif
 
-#if defined(WOLFSSL_QT)
+#if defined(WOLFSSL_QT) && !defined(NO_PSK)
     /* Qt retrieves supported cipher list at initialization 
      * from get_cipher_compat().
-     * Qt doesn't not allow to use a cipher if it is not in the supported list.
+     * Qt doesn't allow to use a cipher if it is not in the supported list.
      * Therefore, we need to enable PSK cipher at the beginning.
      */
     ctx->havePSK = 1;
diff --git a/src/ssl.c b/src/ssl.c
index ebb7a9bd0..aa3bfac6c 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -6898,14 +6898,16 @@ int wolfSSL_CTX_load_verify_locations_ex(WOLFSSL_CTX* ctx, const char* file,
     #if defined(WOLFSSL_QT)
             if (ret == BAD_PATH_ERROR && 
                 flags & WOLFSSL_LOAD_FLAG_IGNORE_BAD_PATH_ERR) {
-           /* QSslSocket always loads certs in system folder 
-            * when it is initialized.
-            * Compliant with OpenSSL when flag sets.*/
+               /* QSslSocket always loads certs in system folder 
+                * when it is initialized.
+                * Compliant with OpenSSL when flag sets.
+                */
                 ret = WOLFSSL_SUCCESS;
             }
-            else
+            else {
                 /* qssl socket wants to know errors. */
                 WOLFSSL_ERROR(ret);
+            }
     #endif
         }
         /* report failure if no files were loaded or there were failures */
@@ -18834,7 +18836,7 @@ WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_set_peer_cert_chain(WOLFSSL* ssl)
     if (sk == NULL) {
         WOLFSSL_MSG("Null session chain");
     }
-#if defined(WOLFSSL_QT)
+#if defined(OPENSSL_ALL)
     else if (ssl->options.side == WOLFSSL_SERVER_END) {
         /* to be compliant with openssl 
            first element is kept as peer cert on server side.*/