diff --git a/.gitignore b/.gitignore
index 2ac54a72..0fe79fb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ BenchmarkDotNet.Artifacts
 .genaiscript
 .idea
 local.settings.json
+.env
 
 *.suo
 *.sdf
diff --git a/.netconfig b/.netconfig
index 305b9533..7eae0d0b 100644
--- a/.netconfig
+++ b/.netconfig
@@ -5,8 +5,8 @@
 	weak
 [file ".gitignore"]
 	url = https://github.com/devlooped/oss/blob/main/.gitignore
-	sha = e0be248fff1d39133345283b8227372b36574b75
-	etag = c449ec6f76803e1891357ca2b8b4fcb5b2e5deeff8311622fd92ca9fbf1e6575
+	sha = 3776526342afb3f57da7e80f2095e5fdca3c31c9
+	etag = 11767f73556aa4c6c8bcc153b77ee8e8114f99fa3b885b0a7d66d082f91e77b3
 	weak
 [file ".gitattributes"]
 	url = https://github.com/devlooped/oss/blob/main/.gitattributes
@@ -30,13 +30,13 @@
 	weak
 [file "src/Directory.Build.props"]
 	url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
-	sha = 81d972fd0760c244d134dae7f4b17d6c43cb004a
-	etag = 1368697c1521e465a1dea88b93787b1c7def441c37d62afc903fb8d07179e4f6
+	sha = c509be4378ff6789df4f66338cb88119453c0975
+	etag = cbbdc1a4d3030f353f3e5306a6c380238dd4ed0945aad2d56ba87b49fcfcd66d
 	weak
 [file "src/Directory.Build.targets"]
 	url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
-	sha = a8b208093599263b7f2d1fe3854634c588ea5199
-	etag = 19087699f05396205e6b050d999a43b175bd242f6e8fac86f6df936310178b03
+	sha = 4339749ef4b8f66def75931df09ef99c149f8421
+	etag = 8b4492765755c030c4c351e058a92f53ab493cab440c1c0ef431f6635c4dae0e
 	weak
 [file ".github/dependabot.yml"]
 	url = https://github.com/devlooped/oss/blob/main/.github/dependabot.yml
@@ -103,6 +103,6 @@
 	weak
 [file "src/Core/System/Collections/Generic/IAsyncEnumerableExtensions.cs"]
 	url = https://github.com/devlooped/catbag/blob/main/System/Collections/Generic/IAsyncEnumerableExtensions.cs
-	sha = fd4229d4b2ebcad93768ddb6afee652d4a476fe2
-	etag = 8710a896af867e690062b025b3f95de9f2e3f219555942ec91e1364ad8d9bfac
+	sha = 3e2b4bfe3f2707bf3567bcd6367db5c7eb2696c0
+	etag = 371342087cec0269473a91f7fc295fd1049e21f016a1b7113614f2c4e3eefe5f
 	weak
diff --git a/src/Core/System/Collections/Generic/IAsyncEnumerableExtensions.cs b/src/Core/System/Collections/Generic/IAsyncEnumerableExtensions.cs
index 507cd109..5ec8d4c5 100644
--- a/src/Core/System/Collections/Generic/IAsyncEnumerableExtensions.cs
+++ b/src/Core/System/Collections/Generic/IAsyncEnumerableExtensions.cs
@@ -39,7 +39,7 @@ static partial class IAsyncEnumerableExtensions
         /// </summary>
         /// <exception cref="ArgumentException">The <paramref name="source"/> does not implement 
         /// <see cref="IAsyncEnumerable{T}"/>.</exception>
-        public static async Task<TSource[]> ToArrayAsync<TSource>(this IAsyncEnumerable<TSource> source)
+        public static async ValueTask<TSource[]> ToArrayAsync<TSource>(this IAsyncEnumerable<TSource> source)
             => (await ToListAsync(source)).ToArray();
 
         /// <summary>
@@ -48,7 +48,7 @@ public static async Task<TSource[]> ToArrayAsync<TSource>(this IAsyncEnumerable<
         /// </summary>
         /// <exception cref="ArgumentException">The <paramref name="source"/> does not implement 
         /// <see cref="IAsyncEnumerable{T}"/>.</exception>
-        public static Task<Dictionary<TKey, TSource>> ToDictionaryAsync<TSource, TKey>(this IAsyncEnumerable<TSource> source, Func<TSource, TKey> keySelector) where TKey : notnull
+        public static ValueTask<Dictionary<TKey, TSource>> ToDictionaryAsync<TSource, TKey>(this IAsyncEnumerable<TSource> source, Func<TSource, TKey> keySelector) where TKey : notnull
             => ToDictionaryAsync(source, keySelector, x => x, null);
 
         /// <summary>
@@ -57,7 +57,7 @@ public static Task<Dictionary<TKey, TSource>> ToDictionaryAsync<TSource, TKey>(t
         /// </summary>
         /// <exception cref="ArgumentException">The <paramref name="source"/> does not implement 
         /// <see cref="IAsyncEnumerable{T}"/>.</exception>
-        public static Task<Dictionary<TKey, TSource>> ToDictionaryAsync<TSource, TKey>(this IAsyncEnumerable<TSource> source, Func<TSource, TKey> keySelector, IEqualityComparer<TKey> comparer) where TKey : notnull
+        public static ValueTask<Dictionary<TKey, TSource>> ToDictionaryAsync<TSource, TKey>(this IAsyncEnumerable<TSource> source, Func<TSource, TKey> keySelector, IEqualityComparer<TKey> comparer) where TKey : notnull
             => ToDictionaryAsync(source, keySelector, x => x, comparer);
 
         /// <summary>
@@ -66,7 +66,7 @@ public static Task<Dictionary<TKey, TSource>> ToDictionaryAsync<TSource, TKey>(t
         /// </summary>
         /// <exception cref="ArgumentException">The <paramref name="source"/> does not implement 
         /// <see cref="IAsyncEnumerable{T}"/>.</exception>
-        public static Task<Dictionary<TKey, TElement>> ToDictionaryAsync<TSource, TKey, TElement>(this IAsyncEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector) where TKey : notnull
+        public static ValueTask<Dictionary<TKey, TElement>> ToDictionaryAsync<TSource, TKey, TElement>(this IAsyncEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector) where TKey : notnull
             => ToDictionaryAsync(source, keySelector, elementSelector, null);
 
         /// <summary>
@@ -76,7 +76,7 @@ public static Task<Dictionary<TKey, TElement>> ToDictionaryAsync<TSource, TKey,
         /// </summary>
         /// <exception cref="ArgumentException">The <paramref name="source"/> does not implement 
         /// <see cref="IAsyncEnumerable{T}"/>.</exception>
-        public static async Task<Dictionary<TKey, TElement>> ToDictionaryAsync<TSource, TKey, TElement>(
+        public static async ValueTask<Dictionary<TKey, TElement>> ToDictionaryAsync<TSource, TKey, TElement>(
             this IAsyncEnumerable<TSource> source, Func<TSource, TKey> keySelector,
             Func<TSource, TElement> elementSelector, IEqualityComparer<TKey>? comparer) where TKey : notnull
         {
@@ -93,7 +93,7 @@ public static async Task<Dictionary<TKey, TElement>> ToDictionaryAsync<TSource,
         /// </summary>
         /// <exception cref="ArgumentException">The <paramref name="source"/> does not implement 
         /// <see cref="IAsyncEnumerable{T}"/>.</exception>
-        public static Task<HashSet<TSource>> ToHashSetAsync<TSource>(this IAsyncEnumerable<TSource> source)
+        public static ValueTask<HashSet<TSource>> ToHashSetAsync<TSource>(this IAsyncEnumerable<TSource> source)
             => ToHashSetAsync(source, null);
 
         /// <summary>
@@ -102,7 +102,7 @@ public static Task<HashSet<TSource>> ToHashSetAsync<TSource>(this IAsyncEnumerab
         /// </summary>
         /// <exception cref="ArgumentException">The <paramref name="source"/> does not implement 
         /// <see cref="IAsyncEnumerable{T}"/>.</exception>
-        public static async Task<HashSet<TSource>> ToHashSetAsync<TSource>(this IAsyncEnumerable<TSource> source, IEqualityComparer<TSource>? comparer)
+        public static async ValueTask<HashSet<TSource>> ToHashSetAsync<TSource>(this IAsyncEnumerable<TSource> source, IEqualityComparer<TSource>? comparer)
         {
             var set = new HashSet<TSource>(comparer);
             await foreach (var item in source)
@@ -117,7 +117,7 @@ public static async Task<HashSet<TSource>> ToHashSetAsync<TSource>(this IAsyncEn
         /// </summary>
         /// <exception cref="ArgumentException">The <paramref name="source"/> does not implement 
         /// <see cref="IAsyncEnumerable{T}"/>.</exception>
-        public static async Task<List<TSource>> ToListAsync<TSource>(this IAsyncEnumerable<TSource> source)
+        public static async ValueTask<List<TSource>> ToListAsync<TSource>(this IAsyncEnumerable<TSource> source)
         {
             var list = new List<TSource>();
             await foreach (var item in source)
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index b24450d7..352da327 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -20,6 +20,7 @@
 
   <PropertyGroup Label="NuGet">
     <Authors>Daniel Cazzulino</Authors>
+    <Company>Devlooped</Company>
     <Copyright>Copyright (C) Daniel Cazzulino and Contributors. All rights reserved.</Copyright>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 6232750f..083afa69 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -165,6 +165,9 @@
 
     <PropertyGroup>
       <RepositoryRoot>@(_GitSourceRoot)</RepositoryRoot>
+      <!-- Only change if it wasn't just the default from Microsoft.NET.DefaultAssemblyInfo.targets -->
+      <ProductFromUrl Condition="'$(SourceControlInformationFeatureSupported)' == 'true'">$([System.IO.Path]::GetFileNameWithoutExtension($(PrivateRepositoryUrl)))</ProductFromUrl>
+      <Product Condition="'$(Product)' == '$(AssemblyName)' and '$(ProductFromUrl)' != ''">$(ProductFromUrl)</Product>
     </PropertyGroup>
 
   </Target>
@@ -175,9 +178,9 @@
           Condition="'$(SourceControlInformationFeatureSupported)' == 'true' And
                      '$(IsPackable)' == 'true'">
     <PropertyGroup>
-      <PackageProjectUrl Condition="'$(PackageProjectUrl)' == '' and '$(PublishRepositoryUrl)' == 'true'">$(RepositoryUrl)</PackageProjectUrl>
+      <PackageProjectUrl Condition="'$(PackageProjectUrl)' == '' and '$(PublishRepositoryUrl)' == 'true'">$(RepositoryUrl.Replace('.git', ''))</PackageProjectUrl>
       <PackageDescription>$(Description)</PackageDescription>
-      <PackageReleaseNotes Condition="'$(RepositoryUrl)' != '' and Exists('$(MSBuildThisFileDirectory)..\changelog.md')">$(RepositoryUrl)/blob/main/changelog.md</PackageReleaseNotes>
+      <PackageReleaseNotes Condition="'$(RepositoryUrl)' != '' and Exists('$(MSBuildThisFileDirectory)..\changelog.md')">$(RepositoryUrl.Replace('.git', ''))/blob/main/changelog.md</PackageReleaseNotes>
     </PropertyGroup>
   </Target>