diff --git a/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs b/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs
index 2db6172b8f35..645d2ccadfc1 100644
--- a/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs
+++ b/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs
@@ -650,13 +650,12 @@ public virtual async Task<IList<UserPasskeyInfo>> GetPasskeysAsync(TUser user, C
         ArgumentNullException.ThrowIfNull(user);
 
         var userId = user.Id;
-        var passkeys = await UserPasskeys
+        var rawPasskeys = await UserPasskeys
             .Where(p => p.UserId.Equals(userId))
-            .Select(p => p.ToUserPasskeyInfo())
             .ToListAsync(cancellationToken)
             .ConfigureAwait(false);
 
-        return passkeys;
+        return rawPasskeys.Select(p => p.ToUserPasskeyInfo()).ToList();
     }
 
     /// <summary>
diff --git a/src/Identity/EntityFrameworkCore/src/UserStore.cs b/src/Identity/EntityFrameworkCore/src/UserStore.cs
index 6ee3419cbb0d..c396eaf249cd 100644
--- a/src/Identity/EntityFrameworkCore/src/UserStore.cs
+++ b/src/Identity/EntityFrameworkCore/src/UserStore.cs
@@ -795,13 +795,12 @@ public virtual async Task<IList<UserPasskeyInfo>> GetPasskeysAsync(TUser user, C
         ArgumentNullException.ThrowIfNull(user);
 
         var userId = user.Id;
-        var passkeys = await UserPasskeys
+        var rawPasskeys = await UserPasskeys
             .Where(p => p.UserId.Equals(userId))
-            .Select(p => p.ToUserPasskeyInfo())
             .ToListAsync(cancellationToken)
             .ConfigureAwait(false);
 
-        return passkeys;
+        return rawPasskeys.Select(p => p.ToUserPasskeyInfo()).ToList();
     }
 
     /// <summary>
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml
index d9ddb1de381a..038cbd2cb4bc 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml
@@ -19,7 +19,7 @@
     <div class="col-md-12">
         @for (var row = 0; row < (Model.RecoveryCodes?.Length ?? 0); row += 2)
         {
-            <code class="recovery-code">@Model.RecoveryCodes![row]</code><text>&nbsp;</text><code class="recovery-code">@Model.RecoveryCodes[row + 1]</code><br />
+            <code class="recovery-code">@Model.RecoveryCodes![row]</code>@Html.Raw("&nbsp;")<code class="recovery-code">@Model.RecoveryCodes[row + 1]</code><br />
         }
     </div>
 </div>
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/ShowRecoveryCodes.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/ShowRecoveryCodes.cshtml
index d9ddb1de381a..038cbd2cb4bc 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/ShowRecoveryCodes.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/ShowRecoveryCodes.cshtml
@@ -19,7 +19,7 @@
     <div class="col-md-12">
         @for (var row = 0; row < (Model.RecoveryCodes?.Length ?? 0); row += 2)
         {
-            <code class="recovery-code">@Model.RecoveryCodes![row]</code><text>&nbsp;</text><code class="recovery-code">@Model.RecoveryCodes[row + 1]</code><br />
+            <code class="recovery-code">@Model.RecoveryCodes![row]</code>@Html.Raw("&nbsp;")<code class="recovery-code">@Model.RecoveryCodes[row + 1]</code><br />
         }
     </div>
 </div>
diff --git a/src/Tools/Extensions.ApiDescription.Server/README.md b/src/Tools/Extensions.ApiDescription.Server/README.md
index f18957070231..8884e9fde055 100644
--- a/src/Tools/Extensions.ApiDescription.Server/README.md
+++ b/src/Tools/Extensions.ApiDescription.Server/README.md
@@ -6,3 +6,19 @@ MSBuild glue for OpenAPI document generation.
 
 See partner packages such as [NSwag.AspNetCore](https://www.nuget.org/packages/NSwag.AspNetCore/) or
 [Swashbuckle.AspNetCore](https://www.nuget.org/packages/Swashbuckle.AspNetCore/) for intended use.
+
+## Viewing Document Generation Logs
+
+When building, the OpenAPI document generation tool (`dotnet-getdocument`) logs output such as `Generating document named 'v1'`.
+
+With the default [Terminal Logger](https://learn.microsoft.com/dotnet/core/tools/dotnet-build#options) introduced in .NET 8, this output is visible at the default verbosity. To see more detailed output, use the `detailed` Terminal Logger verbosity:
+
+```shell
+dotnet build -tlp:v=d
+```
+
+To disable the Terminal Logger entirely and see all build output:
+
+```shell
+dotnet build --tl:off
+```
diff --git a/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets b/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets
index f5b2839bd16d..115991530f80 100644
--- a/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets
+++ b/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets
@@ -64,7 +64,7 @@
 
     <Message Importance="high" Text="%0AGenerateOpenApiDocuments:" />
     <Message Importance="high" Text="  $(_DotNetGetDocumentCommand)" />
-    <Exec Command="$(_DotNetGetDocumentCommand)" LogStandardErrorAsError="true" />
+    <Exec Command="$(_DotNetGetDocumentCommand)" LogStandardErrorAsError="true" StandardOutputImportance="high" />
   </Target>
 
   <!-- Unless this is an inner build or default timing is disabled, tie document retrieval into the build. -->