diff --git a/engine/src/RHI/D3D12/D3D12CommandList.cpp b/engine/src/RHI/D3D12/D3D12CommandList.cpp
index b51119b2..913b89b2 100644
--- a/engine/src/RHI/D3D12/D3D12CommandList.cpp
+++ b/engine/src/RHI/D3D12/D3D12CommandList.cpp
@@ -352,8 +352,6 @@ void D3D12CommandList::SetGraphicsDescriptorSets(
             continue;
         }
 
-        // Descriptor sets are staged in CPU-visible heaps and copied into this
-        // command list's shader-visible heaps immediately before binding.
         if (heap->GetType() == DescriptorHeapType::CBV_SRV_UAV) {
             const bool hasSrvTable = d3d12Layout->UsesSetLayouts()
                 ? d3d12Layout->HasShaderResourceTable(setIndex)
@@ -587,8 +585,6 @@ void D3D12CommandList::SetComputeDescriptorSets(
             continue;
         }
 
-        // Descriptor sets are staged in CPU-visible heaps and copied into this
-        // command list's shader-visible heaps immediately before binding.
         if (heap->GetType() == DescriptorHeapType::CBV_SRV_UAV) {
             const bool hasSrvTable = d3d12Layout->UsesSetLayouts()
                 ? d3d12Layout->HasShaderResourceTable(setIndex)
diff --git a/engine/src/RHI/D3D12/D3D12Device.cpp b/engine/src/RHI/D3D12/D3D12Device.cpp
index 9227932a..1a175ce4 100644
--- a/engine/src/RHI/D3D12/D3D12Device.cpp
+++ b/engine/src/RHI/D3D12/D3D12Device.cpp
@@ -1284,8 +1284,6 @@ RHIDescriptorPool* D3D12Device::CreateDescriptorPool(const DescriptorPoolDesc& d
     DescriptorPoolDesc poolDesc = desc;
     poolDesc.device = m_device.Get();
     if (UsesTransientShaderVisibleDescriptorHeap(poolDesc.type)) {
-        // Descriptor sets are staged in CPU-visible heaps and copied into the
-        // command list's transient shader-visible heaps before each bind.
         poolDesc.shaderVisible = false;
     }
     if (pool->Initialize(poolDesc)) {
diff --git a/tests/Rendering/integration/nahida_preview_scene/main.cpp b/tests/Rendering/integration/nahida_preview_scene/main.cpp
index 7f1e8881..d0a664c7 100644
--- a/tests/Rendering/integration/nahida_preview_scene/main.cpp
+++ b/tests/Rendering/integration/nahida_preview_scene/main.cpp
@@ -100,6 +100,18 @@ std::unordered_set<std::string> GetIsolationObjectNames() {
     std::unordered_set<std::string> result;
     const char* value = std::getenv("XC_NAHIDA_DIAG_ONLY");
     if (value == nullptr) {
+        if (GetDiagnosticMode() != DiagnosticMode::Unlit) {
+            return result;
+        }
+
+        result.emplace("Body_Mesh0");
+        result.emplace("EyeStar");
+        result.emplace("Body_Mesh1");
+        result.emplace("Body_Mesh2");
+        result.emplace("Face");
+        result.emplace("Body_Mesh3");
+        result.emplace("Brow");
+        result.emplace("Face_Eye");
         return result;
     }