diff --git a/psa/build_with_mbedtls_psa.sh b/psa/build_with_mbedtls_psa.sh
index af60eecf..27489053 100755
--- a/psa/build_with_mbedtls_psa.sh
+++ b/psa/build_with_mbedtls_psa.sh
@@ -9,6 +9,7 @@ MBEDTLS_COMMIT_ID=acc74b841307659eea0461275c7c0309874c87d7
 MBEDTLS_DIR=${MBEDTLS_DIR:="/tmp/mbedtls"}
 MBEDTLS_INCLUDE_DIR=${MBEDTLS_DIR}/build/include/
 MBEDTLS_LIB_DIR=${MBEDTLS_DIR}/build/library/
+WOLFSSL_INSTALL=${WOLFSSL_INSTALL:="/usr/local"}
 
 # uncomment to enable debug build
 #MBEDTLS_DEBUG="-DCMAKE_BUILD_TYPE=Debug"
@@ -48,7 +49,7 @@ build_wolfssl() {
     CFLAGS="-Wno-error=redundant-decls -Werror -Wswitch-enum -Wno-error=switch-enum -DWOLFSSL_PSA_GLOBAL_LOCK ${WOLFSSL_DEBUG}" \
           ./configure \
           --enable-psa --with-psa-include="${MBEDTLS_INCLUDE_DIR}" --enable-pkcallbacks\
-          --disable-examples --disable-benchmark --disable-crypttests
+          --disable-examples --disable-benchmark --disable-crypttests --prefix="${WOLFSSL_INSTALL}"
     make
 }
 
diff --git a/psa/client-tls13-ecc-psa.c b/psa/client-tls13-ecc-psa.c
index 478ebda5..986b16ad 100644
--- a/psa/client-tls13-ecc-psa.c
+++ b/psa/client-tls13-ecc-psa.c
@@ -131,7 +131,7 @@ int main(int argc, char** argv)
         return 0;
     }
 
-#ifdef DEBUG
+#ifdef DEBUG_WOLFSSL
     wolfSSL_Debugging_ON();
 #endif
 
diff --git a/psa/server-tls13-ecc-psa.c b/psa/server-tls13-ecc-psa.c
index 10973187..8c01be52 100644
--- a/psa/server-tls13-ecc-psa.c
+++ b/psa/server-tls13-ecc-psa.c
@@ -198,7 +198,7 @@ int main(int argc, char** argv)
     /* Initialize wolfSSL */
     wolfSSL_Init();
 
-#ifdef DEBUG
+#ifdef DEBUG_WOLFSSL
     wolfSSL_Debugging_ON();
 #endif
 
diff --git a/psa/trusted-firwmare/0001-WolfSSL-TLS-1.3-client-server-PSA-demo.patch b/psa/trusted-firmware/0001-WolfSSL-TLS-1.3-client-server-PSA-demo.patch
similarity index 100%
rename from psa/trusted-firwmare/0001-WolfSSL-TLS-1.3-client-server-PSA-demo.patch
rename to psa/trusted-firmware/0001-WolfSSL-TLS-1.3-client-server-PSA-demo.patch
diff --git a/psa/trusted-firwmare/build_tfm_example.sh b/psa/trusted-firmware/build_tfm_example.sh
similarity index 100%
rename from psa/trusted-firwmare/build_tfm_example.sh
rename to psa/trusted-firmware/build_tfm_example.sh