diff --git a/.github/workflows/test-library.yml b/.github/workflows/test-library.yml
index 48d8de3f..76ae150d 100644
--- a/.github/workflows/test-library.yml
+++ b/.github/workflows/test-library.yml
@@ -43,7 +43,7 @@ jobs:
           - name: RSA4096-SHA512
             keygen: --rsa4096
             sign: --rsa4096 --sha3
-            config: SIGN=RSA4096 HASH=SHA3
+            config: SIGN=RSA4096 HASH=SHA3 WOLFBOOT_HUGE_STACK=1
 
     steps:
       - uses: actions/checkout@v4
diff --git a/arch.mk b/arch.mk
index f3b94862..328a1222 100644
--- a/arch.mk
+++ b/arch.mk
@@ -1095,10 +1095,12 @@ ifeq ($(TARGET),x86_64_efi)
   UPDATE_OBJS:=src/update_ram.o
 endif
 
-ifeq ($(TARGET),sim)
+ifeq ($(ARCH),sim)
   USE_GCC_HEADLESS=0
   LD = gcc
-  UPDATE_OBJS:=src/update_flash.o
+  ifneq ($(TARGET),library)
+    UPDATE_OBJS:=src/update_flash.o
+  endif
   LD_START_GROUP=
   LD_END_GROUP=
   BOOT_IMG=test-app/image.elf
diff --git a/include/user_settings.h b/include/user_settings.h
index b921e93e..643aebe9 100644
--- a/include/user_settings.h
+++ b/include/user_settings.h
@@ -215,12 +215,14 @@ extern int tolower(int c);
 #   endif
 #   if defined(WOLFBOOT_SIGN_RSA2048) || defined(WOLFBOOT_SIGN_SECONDARY_RSA2048)
 #       define FP_MAX_BITS (2048 * 2)
+#       define SP_INT_BITS 2048
 #       define WOLFSSL_SP_NO_3072
 #       define WOLFSSL_SP_NO_4096
 #       define WOLFSSL_SP_2048
 #   endif
 #   if defined(WOLFBOOT_SIGN_RSA3072) || defined(WOLFBOOT_SIGN_SECONDARY_RSA3072)
 #       define FP_MAX_BITS (3072 * 2)
+#       define SP_INT_BITS 3072
 #       define WOLFSSL_SP_NO_2048
 #       define WOLFSSL_SP_NO_4096
 #       define WOLFSSL_SP_3072
@@ -228,6 +230,7 @@ extern int tolower(int c);
 
 #   if defined(WOLFBOOT_SIGN_RSA4096) || defined(WOLFBOOT_SIGN_SECONDARY_RSA4096)
 #       define FP_MAX_BITS (4096 * 2)
+#       define SP_INT_BITS 4096
 #       define WOLFSSL_SP_NO_2048
 #       define WOLFSSL_SP_NO_3072
 #       define WOLFSSL_SP_4096
@@ -235,6 +238,7 @@ extern int tolower(int c);
 #   ifdef WOLFCRYPT_SECURE_MODE
 #       undef FP_MAX_BITS
 #       define FP_MAX_BITS (4096 * 2)
+#       define SP_INT_BITS 4096
 #       define WOLFSSL_SP_2048
 #       define WOLFSSL_SP_3072
 #       define WOLFSSL_SP_4096