diff --git a/src/etc/natvis/liballoc.natvis b/src/etc/natvis/liballoc.natvis
index 707643152c9..b9454573de8 100644
--- a/src/etc/natvis/liballoc.natvis
+++ b/src/etc/natvis/liballoc.natvis
@@ -48,6 +48,7 @@
- vec.len
- vec.buf.cap
+ {(char*)vec.buf.ptr.pointer,[vec.len]s8}
vec.len
diff --git a/src/etc/natvis/libcore.natvis b/src/etc/natvis/libcore.natvis
index abac2cefa38..fa8ee2d70bb 100644
--- a/src/etc/natvis/libcore.natvis
+++ b/src/etc/natvis/libcore.natvis
@@ -156,8 +156,8 @@
{secs,d}s {nanos,d}ns
- - secs
- - nanos
+ - secs,d
+ - nanos,d
diff --git a/src/etc/natvis/libstd.natvis b/src/etc/natvis/libstd.natvis
index 25094fc8409..c7be0167de9 100644
--- a/src/etc/natvis/libstd.natvis
+++ b/src/etc/natvis/libstd.natvis
@@ -77,6 +77,7 @@
{(char*)inner.data_ptr}
+ {(char*)inner.data_ptr}
inner.length
@@ -106,6 +107,7 @@
{(char*)inner.inner.bytes.buf.ptr.pointer,[inner.inner.bytes.len]}
+ {(char*)inner.inner.bytes.buf.ptr.pointer,[inner.inner.bytes.len]}
inner.inner.bytes.len
diff --git a/src/test/debuginfo/duration-type.rs b/src/test/debuginfo/duration-type.rs
index 3a7f9f78b5f..bc0266d644e 100644
--- a/src/test/debuginfo/duration-type.rs
+++ b/src/test/debuginfo/duration-type.rs
@@ -8,8 +8,8 @@
// cdb-command: dx duration
// cdb-check:duration : 5s 12ns [Type: core::time::Duration]
// cdb-check: [] [Type: core::time::Duration]
-// cdb-check: seconds : 0x5 [Type: unsigned __int64]
-// cdb-check: nanoseconds : 0xc [Type: unsigned int]
+// cdb-check: seconds : 5 [Type: unsigned __int64]
+// cdb-check: nanoseconds : 12 [Type: unsigned int]
use std::time::Duration;
diff --git a/src/test/debuginfo/marker-types.rs b/src/test/debuginfo/marker-types.rs
index de4e8311a4f..52d70bda908 100644
--- a/src/test/debuginfo/marker-types.rs
+++ b/src/test/debuginfo/marker-types.rs
@@ -8,7 +8,7 @@
// cdb-command: dx nonnull
// cdb-check:nonnull : NonNull(0x[...]: 0xc) [Type: core::ptr::non_null::NonNull]
// cdb-check: [] [Type: core::ptr::non_null::NonNull]
-// cdb-checK: 0xc [Type: unsigned int]
+// cdb-check: 0xc [Type: unsigned int]
// cdb-command: dx manuallydrop
// cdb-check:manuallydrop : 12345 [Type: core::mem::manually_drop::ManuallyDrop]
@@ -19,7 +19,7 @@
// cdb-check: [] [Type: core::pin::Pin >]
// cdb-check: [len] : 0x4 [Type: unsigned __int64]
// cdb-check: [capacity] : 0x4 [Type: unsigned __int64]
-// cdb-check: [chars]
+// cdb-check: [chars] : "this"
use std::mem::ManuallyDrop;
use std::pin::Pin;
diff --git a/src/test/debuginfo/pretty-std.rs b/src/test/debuginfo/pretty-std.rs
index 51325cd4249..303f0114b17 100644
--- a/src/test/debuginfo/pretty-std.rs
+++ b/src/test/debuginfo/pretty-std.rs
@@ -113,7 +113,7 @@
// cdb-command: dx os_string
// cdb-check:os_string : "IAMA OS string 😃" [Type: std::ffi::os_str::OsString]
// cdb-check: [] [Type: std::ffi::os_str::OsString]
-// cdb-check: [chars]
+// cdb-check: [chars] : "IAMA OS string 😃"
// cdb-command: dx some
// cdb-check:some : Some [Type: enum$ >]