diff --git a/recipes-security/optee/optee-os-tadevkit_4.2-l4t-r36.4.3.bb b/recipes-security/optee/optee-os-tadevkit_4.2-l4t-r36.4.3.bb
index 73a397c5..04beaece 100644
--- a/recipes-security/optee/optee-os-tadevkit_4.2-l4t-r36.4.3.bb
+++ b/recipes-security/optee/optee-os-tadevkit_4.2-l4t-r36.4.3.bb
@@ -10,7 +10,7 @@ do_install() {
     for f in ${B}/export-ta_${OPTEE_ARCH}/* ; do
         cp -aR $f ${D}${includedir}/optee/export-user_ta/
     done
-    sed -i -r -e's!-f(macro|debug)-prefix-map=[^ ]+!!g' ${D}${includedir}/optee/export-user_ta/mk/conf.mk
+    sed -i -r -e's!-f(macro|debug|file)-prefix-map=[^ ]+!!g' ${D}${includedir}/optee/export-user_ta/mk/conf.mk
 }
 
 FILES:${PN} = "${includedir}/optee/"
diff --git a/recipes-security/optee/optee-test_4.2-l4t-r36.4.3.bb b/recipes-security/optee/optee-test_4.2-l4t-r36.4.3.bb
index 9a571177..59d7c71e 100644
--- a/recipes-security/optee/optee-test_4.2-l4t-r36.4.3.bb
+++ b/recipes-security/optee/optee-test_4.2-l4t-r36.4.3.bb
@@ -14,6 +14,8 @@ DEPENDS += "optee-os-tadevkit optee-client openssl"
 S = "${WORKDIR}/optee_test"
 B = "${WORKDIR}/build"
 
+CFLAGS += "-std=gnu17 -Wno-error=unterminated-string-initialization"
+
 EXTRA_OEMAKE += " \
     CROSS_COMPILE_HOST=${HOST_PREFIX} \
     CROSS_COMPILE_TA=${HOST_PREFIX} \