diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/DumpFileLoader.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/DumpFileLoader.java
index 4820494793..7996e810eb 100644
--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/DumpFileLoader.java
+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/DumpFileLoader.java
@@ -286,7 +286,8 @@ public class DumpFileLoader extends AbstractLibrarySupportLoader {
 					DataUtilities.ClearDataMode.CHECK_FOR_SPACE);
 			}
 			catch (CodeUnitInsertionException e) {
-				Msg.error(this, "Could not create " + dd.getDataType().getName() + " at " + address);
+				Msg.error(this,
+					"Could not create " + dd.getDataType().getName() + " at " + address);
 			}
 			monitor.setProgress(count++);
 			monitor.checkCanceled();
diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamA.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamA.java
index 1bb8dc7df4..eded172745 100644
--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamA.java
+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamA.java
@@ -43,8 +43,8 @@ public class CommentStreamA implements StructConverter {
 	private void parse() throws IOException {
 		reader.setPointerIndex(index);
 
-		commentLength = reader.readNextInt();
 		comment = reader.readNextAsciiString();
+		commentLength = (int) (reader.getPointerIndex() - index);
 
 	}
 
@@ -54,7 +54,6 @@ public class CommentStreamA implements StructConverter {
 	public DataType toDataType() throws DuplicateNameException {
 		StructureDataType struct = new StructureDataType(NAME, 0);
 
-		struct.add(DWORD, 4, "CommentLength", null);
 		struct.add(ASCII, commentLength, "Comment", null);
 
 		return struct;
diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamW.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamW.java
index e60e479c5d..45d644559f 100644
--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamW.java
+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/mdmp/CommentStreamW.java
@@ -43,8 +43,8 @@ public class CommentStreamW implements StructConverter {
 	private void parse() throws IOException {
 		reader.setPointerIndex(index);
 
-		commentLength = reader.readNextInt();
 		comment = reader.readNextUnicodeString();
+		commentLength = (int) (reader.getPointerIndex() - index);
 
 	}
 
@@ -54,7 +54,6 @@ public class CommentStreamW implements StructConverter {
 	public DataType toDataType() throws DuplicateNameException {
 		StructureDataType struct = new StructureDataType(NAME, 0);
 
-		struct.add(DWORD, 4, "CommentLength", null);
 		struct.add(UTF16, commentLength, "Comment", null);
 
 		return struct;