diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51889ebecc..bd9a7487df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2376,8 +2376,7 @@ install(FILES
 # Install the export set
 install(EXPORT wolfssl-targets
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wolfssl
-        FILE wolfssl-targets.cmake
-        NAMESPACE wolfssl::)
+        FILE wolfssl-config.cmake)
 
 # TODO: Distro build + rules for what to include in the distro.
 #       See various include.am files.
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 0d4d741657..556a3a106f 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -30686,9 +30686,9 @@ int wc_SetCustomExtension(Cert *cert, int critical, const char *oid,
 
     ext = &cert->customCertExt[cert->customCertExtCount];
 
-    ext->oid = oid;
+    ext->oid = (char*)oid;
     ext->crit = (critical == 0) ? 0 : 1;
-    ext->val = der;
+    ext->val = (byte*)der;
     ext->valSz = derSz;
 
     cert->customCertExtCount++;