diff --git a/configure.ac b/configure.ac
index 7a9ec151d1..a7176c4bfb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1658,7 +1658,6 @@ AC_ARG_ENABLE([tailscale],
 if test "$ENABLED_TAILSCALE" = "yes"
 then
     enable_wolfguard=yes
-    test "x$enable_sp" = "x" && enable_sp="yes,256"
     enable_opensslall=yes
     enable_alpn=yes
     enable_sni=yes
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index d935483538..657bfb9f6e 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -12931,7 +12931,11 @@ int wc_Ed448PublicKeyToDer(const ed448_key* key, byte* output, word32 inLen,
         return BAD_FUNC_ARG;
     }
 
+    #if defined(HAVE_FIPS) && FIPS_VERSION3_LT(7,0,0)
+    ret = wc_ed448_export_public((ed448_key *)key, pubKey, &pubKeyLen);
+    #else
     ret = wc_ed448_export_public(key, pubKey, &pubKeyLen);
+    #endif
     if (ret == 0) {
         ret = SetAsymKeyDerPublic(pubKey, pubKeyLen, output, inLen,
             ED448k, withAlg);