diff --git a/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml b/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
index ddae4a86d..866e221fa 100644
--- a/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramCPQ" addr="0xfa0000" size="0x60000" comment="COMPAQ memory at 0xFA0000"/>
 	<ram id="ramExt" addr="0x100000" size="0x100000" comment="Extended memory at 0x100000"/>
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
-	<video ref="/devices/pc/video/compaq/vga/109360-001/256kb-vga-lock.xml"/>
+	<video ref="/devices/pc/video/compaq/vga/109360-001/256kb-autolock.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "COMPAQ MS-DOS 3.31 (Disk 2)", path: "/disks/pc/dos/compaq/3.31/COMPAQ-DOS331-DISK2.json"}, B: {name: "COMPAQ MS-DOS 3.31 (Disk 3)", path: "/disks/pc/dos/compaq/3.31/COMPAQ-DOS331-DISK3.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault|port" commands=""/>
diff --git a/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml b/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
index 1157efa30..d82c4c236 100644
--- a/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramCPQ" addr="0xfa0000" size="0x60000" comment="COMPAQ memory at 0xFA0000"/>
 	<ram id="ramExt" addr="0x100000" size="0x100000" comment="Extended memory at 0x100000"/>
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
-	<video ref="/devices/pc/video/compaq/vga/109360-001/256kb-vga-lock.xml"/>
+	<video ref="/devices/pc/video/compaq/vga/109360-001/256kb-autolock.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "COMPAQ MS-DOS 3.31 (Disk 2)", path: "/disks/pc/dos/compaq/3.31/COMPAQ-DOS331-DISK2.json"}, B: {name: "COMPAQ MS-DOS 3.31 (Disk 3)", path: "/disks/pc/dos/compaq/3.31/COMPAQ-DOS331-DISK3.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault|port" commands=""/>
diff --git a/devices/pc/video/compaq/ega/000412-001B/256kb-autolockfs.xml b/devices/pc/video/compaq/ega/000412-001B/256kb-autolockfs.xml
index 08dc0edc1..ee44fa4d4 100644
--- a/devices/pc/video/compaq/ega/000412-001B/256kb-autolockfs.xml
+++ b/devices/pc/video/compaq/ega/000412-001B/256kb-autolockfs.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x40000" screenwidth="1280" screenheight="800" scale="true" touchscreen="mouse" autolock="true" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x40000" screenwidth="1280" screenheight="700" scale="true" touchscreen="mouse" autolock="true" pos="center" padding="8px">
+	<comment>
+		If [Wikipedia](https://en.wikipedia.org/wiki/Enhanced_Graphics_Adapter) is correct that the IBM EGA
+		(presumably when paired with an IBM 5154 EGA monitor) has a "pixel aspect ratio" of 1:1.37 at its highest
+		resolution (640x350), that suggests we should "stretch" our screen size vertically to 350 * 1.37, or 640x480
+		(or something proportional, like 1280x960), assuming the native display has a "pixel aspect ratio" of 1:1.
+		But testing reveals that round images appear roundest when we stick with a screen size proportional to 640x350.
+		Also note that 1280x700 produces crisper results than 640x350, and 2560x1400 is sharper still (at least when
+		using Chrome).  I'm going to split the difference and go with 1280x700.
+	</comment>
 	<menu>
 		<title>COMPAQ Enhanced Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pc/video/compaq/vga/109360-001/256kb-vga-lock.xml b/devices/pc/video/compaq/vga/109360-001/256kb-autolock.xml
similarity index 100%
rename from devices/pc/video/compaq/vga/109360-001/256kb-vga-lock.xml
rename to devices/pc/video/compaq/vga/109360-001/256kb-autolock.xml
diff --git a/devices/pc/video/ibm/ega/1984-09-13/128kb-autolock640.xml b/devices/pc/video/ibm/ega/1984-09-13/128kb-autolock640.xml
index 091341ccf..e7c9b8ddb 100644
--- a/devices/pc/video/ibm/ega/1984-09-13/128kb-autolock640.xml
+++ b/devices/pc/video/ibm/ega/1984-09-13/128kb-autolock640.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="400" autolock="true" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="350" autolock="true" pos="center" padding="8px">
 	<menu>
 		<title>IBM Enhanced Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml b/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml
index e0d724405..3ec0d94d6 100644
--- a/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml
+++ b/devices/pc/video/ibm/ega/1984-09-13/128kb-autolockfs.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x20000" screenwidth="1280" screenheight="800" scale="true" touchscreen="mouse" autolock="true" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x20000" screenwidth="1280" screenheight="700" scale="true" touchscreen="mouse" autolock="true" pos="center" padding="8px">
+	<comment>
+		If [Wikipedia](https://en.wikipedia.org/wiki/Enhanced_Graphics_Adapter) is correct that the IBM EGA
+		(presumably when paired with an IBM 5154 EGA monitor) has a "pixel aspect ratio" of 1:1.37 at its highest
+		resolution (640x350), that suggests we should "stretch" our screen size vertically to 350 * 1.37, or 640x480
+		(or something proportional, like 1280x960), assuming the native display has a "pixel aspect ratio" of 1:1.
+		But testing reveals that round images appear roundest when we stick with a screen size proportional to 640x350.
+		Also note that 1280x700 produces crisper results than 640x350, and 2560x1400 is sharper still (at least when
+		using Chrome).  I'm going to split the difference and go with 1280x700.
+	</comment>
 	<menu>
 		<title>IBM Enhanced Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pc/video/ibm/ega/1984-09-13/128kb-lockfs.xml b/devices/pc/video/ibm/ega/1984-09-13/128kb-lockfs.xml
index 9b968b84a..bc8a61974 100644
--- a/devices/pc/video/ibm/ega/1984-09-13/128kb-lockfs.xml
+++ b/devices/pc/video/ibm/ega/1984-09-13/128kb-lockfs.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x20000" screenwidth="1280" screenheight="800" scale="true" touchscreen="mouse" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x20000" screenwidth="1280" screenheight="700" scale="true" touchscreen="mouse" pos="center" padding="8px">
+	<comment>
+		If [Wikipedia](https://en.wikipedia.org/wiki/Enhanced_Graphics_Adapter) is correct that the IBM EGA
+		(presumably when paired with an IBM 5154 EGA monitor) has a "pixel aspect ratio" of 1:1.37 at its highest
+		resolution (640x350), that suggests we should "stretch" our screen size vertically to 350 * 1.37, or 640x480
+		(or something proportional, like 1280x960), assuming the native display has a "pixel aspect ratio" of 1:1.
+		But testing reveals that round images appear roundest when we stick with a screen size proportional to 640x350.
+		Also note that 1280x700 produces crisper results than 640x350, and 2560x1400 is sharper still (at least when
+		using Chrome).  I'm going to split the difference and go with 1280x700.
+	</comment>
 	<menu>
 		<title>IBM Enhanced Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pc/video/ibm/ega/1984-09-13/256kb-autolock640.xml b/devices/pc/video/ibm/ega/1984-09-13/256kb-autolock640.xml
index 4c2040790..f827cfea7 100644
--- a/devices/pc/video/ibm/ega/1984-09-13/256kb-autolock640.xml
+++ b/devices/pc/video/ibm/ega/1984-09-13/256kb-autolock640.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x40000" screenwidth="640" screenheight="400" width="640px" autolock="true" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x40000" screenwidth="640" screenheight="350" autolock="true" pos="center" padding="8px">
 	<menu>
 		<title>IBM Enhanced Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pc/video/ibm/ega/1984-09-13/256kb-autolockfs.xml b/devices/pc/video/ibm/ega/1984-09-13/256kb-autolockfs.xml
index d5fb2f514..88d85039c 100644
--- a/devices/pc/video/ibm/ega/1984-09-13/256kb-autolockfs.xml
+++ b/devices/pc/video/ibm/ega/1984-09-13/256kb-autolockfs.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x40000" screenwidth="1280" screenheight="800" scale="true" touchscreen="mouse" autolock="true" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x40000" screenwidth="1280" screenheight="700" scale="true" touchscreen="mouse" autolock="true" pos="center" padding="8px">
+	<comment>
+		If [Wikipedia](https://en.wikipedia.org/wiki/Enhanced_Graphics_Adapter) is correct that the IBM EGA
+		(presumably when paired with an IBM 5154 EGA monitor) has a "pixel aspect ratio" of 1:1.37 at its highest
+		resolution (640x350), that suggests we should "stretch" our screen size vertically to 350 * 1.37, or 640x480
+		(or something proportional, like 1280x960), assuming the native display has a "pixel aspect ratio" of 1:1.
+		But testing reveals that round images appear roundest when we stick with a screen size proportional to 640x350.
+		Also note that 1280x700 produces crisper results than 640x350, and 2560x1400 is sharper still (at least when
+		using Chrome).  I'm going to split the difference and go with 1280x700.
+	</comment>
 	<menu>
 		<title>IBM Enhanced Color Display</title>
 		<control type="container" pos="right">
diff --git a/devices/pc/video/ibm/ega/1984-09-13/256kb-lockfs.xml b/devices/pc/video/ibm/ega/1984-09-13/256kb-lockfs.xml
index 5da46ae59..027585c60 100644
--- a/devices/pc/video/ibm/ega/1984-09-13/256kb-lockfs.xml
+++ b/devices/pc/video/ibm/ega/1984-09-13/256kb-lockfs.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<video id="videoEGA" model="ega" memory="0x40000" screenwidth="1280" screenheight="800" scale="true" touchscreen="mouse" pos="center" padding="8px">
+<video id="videoEGA" model="ega" memory="0x40000" screenwidth="1280" screenheight="700" scale="true" touchscreen="mouse" pos="center" padding="8px">
+	<comment>
+		If [Wikipedia](https://en.wikipedia.org/wiki/Enhanced_Graphics_Adapter) is correct that the IBM EGA
+		(presumably when paired with an IBM 5154 EGA monitor) has a "pixel aspect ratio" of 1:1.37 at its highest
+		resolution (640x350), that suggests we should "stretch" our screen size vertically to 350 * 1.37, or 640x480
+		(or something proportional, like 1280x960), assuming the native display has a "pixel aspect ratio" of 1:1.
+		But testing reveals that round images appear roundest when we stick with a screen size proportional to 640x350.
+		Also note that 1280x700 produces crisper results than 640x350, and 2560x1400 is sharper still (at least when
+		using Chrome).  I'm going to split the difference and go with 1280x700.
+	</comment>
 	<menu>
 		<title>IBM Enhanced Color Display</title>
 		<control type="container" pos="right">
diff --git a/modules/pcjs/templates/components.xsl b/modules/pcjs/templates/components.xsl
index aead29730..0b2b4a4b4 100644
--- a/modules/pcjs/templates/components.xsl
+++ b/modules/pcjs/templates/components.xsl
@@ -1116,7 +1116,8 @@
 		</xsl:call-template>
 	</xsl:template>
 
-	<xsl:template name="comment">
+	<xsl:template match="comment">
+		<xsl:comment><xsl:apply-templates/></xsl:comment>
 	</xsl:template>
 
 </xsl:stylesheet>