diff --git a/renderdoc/driver/d3d12/d3d12_dxil_debug.cpp b/renderdoc/driver/d3d12/d3d12_dxil_debug.cpp
index ce4d40550..55e536d80 100644
--- a/renderdoc/driver/d3d12/d3d12_dxil_debug.cpp
+++ b/renderdoc/driver/d3d12/d3d12_dxil_debug.cpp
@@ -232,7 +232,7 @@ static void FlattenSingleVariable(const rdcstr &cbufferName, uint32_t byteOffset
     for(uint32_t reg = 0; reg < numRegisters; reg++)
     {
       outvars[outIdx + reg].rows = 1;
-      outvars[outIdx + reg].type = VarType::Unknown;
+      outvars[outIdx + reg].type = v.type;
       outvars[outIdx + reg].columns = v.columns;
       outvars[outIdx + reg].flags = v.flags;
     }
diff --git a/renderdoc/driver/shaders/dxil/dxil_debug.cpp b/renderdoc/driver/shaders/dxil/dxil_debug.cpp
index cbe58bea7..1484f669d 100644
--- a/renderdoc/driver/shaders/dxil/dxil_debug.cpp
+++ b/renderdoc/driver/shaders/dxil/dxil_debug.cpp
@@ -2584,9 +2584,8 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper,
                           if(!result.members[arrayIndex].members.empty())
                           {
                             rdcstr name =
-                                StringFormat::Fmt("%s_%u_%u", result.name.c_str(), arrayIndex, 0);
+                                resRef->resourceBase.name + StringFormat::Fmt("[%u]", arrayIndex);
                             result = result.members[arrayIndex].members[0];
-                            result.type = VarType::Float;
                             result.name = name;
                           }
                         }