diff --git a/generate4.xml b/generate4.xml
index 5978ef99..0951f16e 100644
--- a/generate4.xml
+++ b/generate4.xml
@@ -44,7 +44,7 @@
       <!-- <dependency name="rt" function="clock_gettime" system="linux" system_exclude="android" /> -->
       <!-- Arbitrary minimum version, current nuget package is v0.6.1. -->
       <dependency name="secp256k1" version="0.5.1.0" option="secp256k1" />
-      <dependency name="ultrafast" version="4.1.1.4" option="ultrafast" />
+      <dependency name="ultrafast" version="4.0.0.0" option="ultrafast" />
 
       <!-- General flags -->
       <flag name="std=c++20" comment="Require c++20 for all c++ products." context="c++" />
diff --git a/templates/msbuild/vcxproj.gsl b/templates/msbuild/vcxproj.gsl
index d918d2e2..b9623ea9 100644
--- a/templates/msbuild/vcxproj.gsl
+++ b/templates/msbuild/vcxproj.gsl
@@ -165,6 +165,64 @@ function annotate_conflicts(items)
     endnew
 endfunction
 
+function linearize_nuget_packages(packages, toolset, target, repository, configuration)
+    define my.packages = linearize_nuget_packages.packages
+    define my.toolset = linearize_nuget_packages.toolset
+    define my.target = linearize_nuget_packages.target
+    define my.repository = linearize_nuget_packages.repository
+    define my.configuration = linearize_nuget_packages.configuration
+
+    new dependencies as _dependencies
+        target_dependency_list(_dependencies, my.target, my.repository, my.configuration)
+
+        for _dependencies.dependency as _depend where defined(_depend->nuget)
+            define my.found = 0
+
+            for _depend->nuget.resource as _resource where \
+                !defined(_resource.component)
+
+                for _resource.package as _package where \
+                    (_package.compiler = my.toolset.compiler)
+
+                    my.found = 1
+
+                    new my.packages.item as _item
+                        _item.name = path(nuget_target(_package))
+                    endnew
+                endfor
+
+
+                if !my.found
+                    echo("  Warning: resource '$(_resource.canonical)' did not emit a package with compiler '$(my.toolset.compiler)'.")
+                endif
+            endfor
+
+            # address component resources
+            for _depend.component as _component
+                define my.found = 0
+
+                for _depend->nuget.resource as _resource where \
+                    defined(_resource.component) & (_resource.component = _component.name)
+
+                    for _resource.package as _package where \
+                        (_package.compiler = my.toolset.compiler)
+
+                        my.found = 1
+
+                        new my.packages.item as _item
+                            _item.name = path(nuget_target(_package))
+                        endnew
+                    endfor
+
+                    if !my.found
+                        echo("  Warning: resource '$(_resource.canonical)' did not emit a package with compiler '$(my.toolset.compiler)'.")
+                    endif
+                endfor
+            endfor
+        endfor
+    endnew
+endfunction
+
 ###############################################################################
 # Generation
 ###############################################################################
@@ -225,7 +283,6 @@ endfunction
                 my.target, my.absolute_root, my.intended_prefix)
 .
 .   # ClCompile
-
   <ItemGroup>
 .           new items as _items
 .               linearize_sources(_items, _files, _substitutions, my.meta->sources, "obj")
@@ -403,53 +460,11 @@ $(my.indent)<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="Prepare
     $(my.indent)<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The Missing file is {0}.</ErrorText>
   $(my.indent)</PropertyGroup>
 .
-.   new dependencies as _dependencies
-.       target_dependency_list(_dependencies, my.target, my.repository, my.configuration)
-.       for _dependencies.dependency as _depend by _depend.name \
-            where defined(_depend->nuget)
-.
-.           for _depend->nuget.resource as _resource where \
-                !defined(_resource.component)
-.
-.               define my.found = 0
+.   new packages as _packages
+.       linearize_nuget_packages(_packages, my.toolset, my.target, my.repository, my.configuration)
 .
-.               for _resource.package as _package where \
-                    (_package.compiler = my.toolset.compiler)
-.
-.                   my.found = 1
-.
-.                   define my.nutarget = path(nuget_target(_package))
-  $(my.indent)<Error Condition="!Exists('$(my.nutarget)')" Text="\$([System.String]::Format('\$(ErrorText)', '$(my.nutarget)'))" />
-.
-.               endfor
-.
-.               if !my.found
-.                   echo("  Warning: resource '$(_resource.canonical)' did not emit a package with compiler '$(my.toolset.compiler)'.")
-.               endif
-.           endfor
-.
-.           # address component resources
-.           for _depend.component as _component by _component.name
-.               for _depend->nuget.resource as _resource where \
-                    defined(_resource.component) & (_resource.component = _component.name)
-.
-.                   define my.found = 0
-.
-.                   for _resource.package as _package where \
-                        (_package.compiler = my.toolset.compiler)
-.
-.                       my.found = 1
-.
-.                       define my.nutarget = path(nuget_target(_package))
-  $(my.indent)<Error Condition="!Exists('$(my.nutarget)')" Text="\$([System.String]::Format('\$(ErrorText)', '$(my.nutarget)'))" />
-.
-.                   endfor
-.
-.                   if !my.found
-.                       echo("  Warning: resource '$(_resource.canonical)' did not emit a package with compiler '$(my.toolset.compiler)'.")
-.                   endif
-.               endfor
-.           endfor
+.       for _packages.item as _item by "$(_item.name:lower)"
+  $(my.indent)<Error Condition="!Exists('$(_item.name)')" Text="\$([System.String]::Format('\$(ErrorText)', '$(_item.name)'))" />
 .       endfor
 .   endnew
 .
diff --git a/version4.xml b/version4.xml
index f051c819..86791dc2 100644
--- a/version4.xml
+++ b/version4.xml
@@ -68,7 +68,7 @@
       </dependency>
 
       <dependency name="secp256k1" version="0.7.0" option="secp256k1" />
-      <dependency name="UltrafastSecp256k1" version="4.1.1.7" option="ultrafast" />
+      <dependency name="UltrafastSecp256k1" version="4.0.0.0" option="ultrafast" />
 
       <compiler standard="20">
         <flag option="avx2"
@@ -1957,12 +1957,12 @@
       conditional="true"
       comment="Build Ultra high-performance secp256k1 ECC engine."
       optionname="ultrafast">
-      <github owner="pmienk" tag="main" />
+      <github owner="shrec" tag="main" />
       <nuget>
         <resource canonical="UltrafastSecp256k1">
           <package compiler="v143" name="UltrafastSecp256k1-vc143" version="4.1.1.7"
             targets="build/native" />
-          <package compiler="v145" name="UltrafastSecp256k1-vc145" version="4.1.1.7"
+          <package compiler="v145" name="UltrafastSecp256k1-vc145" version="4.3.0.3"
             targets="build/native" />
         </resource>
       </nuget>
@@ -1976,16 +1976,16 @@
         <option value="-DSECP256K1_BUILD_CABI=ON" />
         <option value="-DSECP256K1_BUILD_CPU=ON" />
         <option value="-DSECP256K1_BUILD_SHIM=ON" />
-        <option value="-DSECP256K1_BUILD_CUDA=OFF" />
-        <option value="-DSECP256K1_BUILD_ROCM=OFF" />
-        <option value="-DSECP256K1_BUILD_OPENCL=OFF" />
-        <option value="-DSECP256K1_BUILD_METAL=OFF" />
+        <option value="-DSECP256K1_BUILD_CUDA=ON" />
+        <option value="-DSECP256K1_BUILD_ROCM=ON" />
+        <option value="-DSECP256K1_BUILD_OPENCL=ON" />
+        <option value="-DSECP256K1_BUILD_METAL=ON" />
         <option value="-DSECP256K1_INSTALL=ON" />
         <option value="-DSECP256K1_INSTALL_PKGCONFIG=ON" />
         <option value="-DSECP256K1_USE_ULTRAFAST=ON" />
       </build>
       <cmake namespace="secp256k1" package="secp256k1-fast"
-        target="secp256k1-fast" />
+        target="secp256k1::fastsecp256k1" />
     </dependency>
     <dependency name="secp256k1"
       textname="libsecp256k1"