diff --git a/src/linker/linker.natvis b/src/linker/linker.natvis
index 84296c9c..0cc2d7f8 100644
--- a/src/linker/linker.natvis
+++ b/src/linker/linker.natvis
@@ -240,5 +240,32 @@
     </Expand>
   </Type>
 
+  <Type Name="HashMap">
+    <DisplayString>{{ count={count} tombstones={tombstone_count} }}</DisplayString>
+    <Expand>
+      <Item Name="[count]">count</Item>
+      <Item Name="[tombstone count]">tombstone_count</Item>
+      <Item Name="[root]">root</Item>
+    </Expand>
+  </Type>
+
+  <Type Name="HashMapNode">
+    <DisplayString Condition="is_live">live</DisplayString>
+    <DisplayString>tombstone</DisplayString>
+    <Expand>
+      <Item Name="[key]" Condition="is_live">v.key</Item>
+      <Item Name="[value]" Condition="is_live">v.value</Item>
+      <Synthetic Name="[children]">
+        <DisplayString>radix children</DisplayString>
+        <Expand>
+          <Item Name="[0]" Condition="children[0] != 0">children[0]</Item>
+          <Item Name="[1]" Condition="children[1] != 0">children[1]</Item>
+          <Item Name="[2]" Condition="children[2] != 0">children[2]</Item>
+          <Item Name="[3]" Condition="children[3] != 0">children[3]</Item>
+        </Expand>
+      </Synthetic>
+    </Expand>
+  </Type>
+
 </AutoVisualizer>
 
diff --git a/src/natvis/base.natvis b/src/natvis/base.natvis
index 8009134e..3e854654 100644
--- a/src/natvis/base.natvis
+++ b/src/natvis/base.natvis
@@ -18,18 +18,18 @@
 				<Size>node_count</Size>
 				<HeadPointer>first</HeadPointer>
 				<NextPointer>next</NextPointer>
-				<ValueNode>this</ValueNode>
+				<ValueNode>string</ValueNode>
 			</LinkedListItems>
 		</Expand>
 	</Type>
 	
-	<Type Name="String8Array">
-    <DisplayString>{{ count={count} pointer={strings} }}</DisplayString>
+  <Type Name="String8Array">
+    <DisplayString>{{ count={count} pointer={v} }}</DisplayString>
     <Expand>
       <Item Name="[count]">count</Item>
       <ArrayItems>
         <Size>count</Size>
-        <ValuePointer>strings</ValuePointer>
+        <ValuePointer>v</ValuePointer>
       </ArrayItems>
     </Expand>
 	</Type>
@@ -142,7 +142,7 @@
   </Type>
 
   <Type Name="CmdLineOpt">
-    <DisplayString>{{ name={string} hash={hash} value_string={value_string} value_stirngs={value_strings} }}</DisplayString>
+    <DisplayString>{{ name={string} hash={hash} value_string={value_string} value_strings={value_strings} }}</DisplayString>
   </Type>
 
   <Type Name="CmdLineOptList">
@@ -211,7 +211,6 @@
     <Expand>
       <Item Name="kind">kind</Item>
       <Item Name="next">next</Item>
-      <Item Name="next">next</Item>
       <Item Name="parent">parent</Item>
       <Synthetic Name="[children]">
         <DisplayString>{first_child}</DisplayString>