diff --git a/devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml b/devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml
index 848d4b147..603a9c23e 100644
--- a/devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5160/basic/BASIC110.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5160/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml"/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us83-buttons-functions.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pcx86/panel/wide.xml"/>
diff --git a/devices/pcx86/machine/5160/ega/640kb/machine.xml b/devices/pcx86/machine/5160/ega/640kb/machine.xml
index ebcf17340..2f7249dea 100644
--- a/devices/pcx86/machine/5160/ega/640kb/machine.xml
+++ b/devices/pcx86/machine/5160/ega/640kb/machine.xml
@@ -8,7 +8,7 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5160/basic/BASIC110.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5160/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml"/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="right" padRight="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
diff --git a/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml b/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml
index 96d891cf7..b687d2a6f 100644
--- a/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml
+++ b/devices/pcx86/machine/5160/mda/256kb/fake188/debugger/machine.xml
@@ -9,7 +9,7 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5160/basic/BASIC110.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5160/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/mda/ibm-mda.xml"/>
-	<fdc id="fdcNEC" pos="left" padLeft="8px" padBottom="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"Executive Suite (1982)",path:"/apps/pcx86/1982/esuite/disk.json"}}'>
+	<fdc id="fdcNEC" pos="left" padLeft="8px" padBottom="8px" autoMount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"Executive Suite (1982)",path:"/apps/pcx86/1982/esuite/disk.json"}}'>
 		<control type="list" binding="listDrives"/>
 		<control type="list" binding="listDisks">
 			<manifest ref="/disks/pcx86/dos/ibm/1.00/manifest.xml" disk="*"/>
diff --git a/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml b/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml
index a069b7e9f..8d80727d4 100644
--- a/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml
+++ b/devices/pcx86/machine/5160/mda/256kb/fake188/machine.xml
@@ -8,7 +8,7 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5160/basic/BASIC110.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5160/1982-11-08/XTBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/mda/ibm-mda.xml"/>
-	<fdc id="fdcNEC" pos="left" padLeft="8px" padBottom="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"Executive Suite (1982)",path:"/apps/pcx86/1982/esuite/disk.json"}}'>
+	<fdc id="fdcNEC" pos="left" padLeft="8px" padBottom="8px" autoMount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"Executive Suite (1982)",path:"/apps/pcx86/1982/esuite/disk.json"}}'>
 		<control type="list" binding="listDrives"/>
 		<control type="list" binding="listDisks">
 			<manifest ref="/disks/pcx86/dos/ibm/1.00/manifest.xml" disk="*"/>
diff --git a/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.xml b/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.xml
index 815e60f33..971526996 100644
--- a/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/cga/640kb/rev3/debugger/machine.xml
@@ -7,7 +7,7 @@
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/cga/ibm-cga.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pcx86/panel/wide.xml"/>
diff --git a/devices/pcx86/machine/5170/cga/640kb/rev3/machine.xml b/devices/pcx86/machine/5170/cga/640kb/rev3/machine.xml
index d48651a20..daa52bef5 100644
--- a/devices/pcx86/machine/5170/cga/640kb/rev3/machine.xml
+++ b/devices/pcx86/machine/5170/cga/640kb/rev3/machine.xml
@@ -7,7 +7,7 @@
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/cga/ibm-cga.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-functions.xml"/>
 	<chipset id="chipset" model="5170" floppies="[1200,1200]" monitor="color"/>
 	<serial id="com1" adapter="1"/>
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.xml
index 37771b917..53712bf33 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev1/debugger/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1984-01-10/ATBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pcx86/panel/wide.xml"/>
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.xml
index ceb89ddd7..5006a93c5 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev1/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1984-01-10/ATBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-functions.xml"/>
 	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2}]'/>
 	<chipset id="chipset" model="5170" floppies="[1200,1200]"/>
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
index 82dafddf8..cfd0ada44 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.20 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK1.json"}, B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.20 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK1.json"}, B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pcx86/panel/btpanel.xml"/>
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.xml
index 394b6178b..00d8b60c4 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev3/debugger/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pcx86/panel/wide.xml"/>
diff --git a/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml b/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml
index 305e5de23..0a2cc6691 100644
--- a/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml
+++ b/devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml
@@ -7,7 +7,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<hdc ref="/disks/pcx86/fixed/20mb/pcdos330-empty.xml"/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true" pos="right" padRight="8px" padBottom="8px">
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml
index f2574c359..9fbd34eb8 100644
--- a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-lockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pcx86/panel/btpanel.xml"/>
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
index 6aaf0df0c..93df7dba1 100644
--- a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-lockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pcx86/panel/wide.xml"/>
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/machine.xml b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/machine.xml
index 7e6d2b68c..c8c5ca326 100644
--- a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/machine.xml
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-lockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pcx86/panel/wide.xml"/>
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml b/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
index 7c2324846..06e0f0d13 100644
--- a/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-lockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<hdc ref="/disks/pcx86/fixed/20mb/pcdos330-empty.xml"/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
diff --git a/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml b/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml
index b1005fc0c..426297248 100644
--- a/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml
@@ -7,7 +7,7 @@
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1984-01-10/ATBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pcx86/panel/wide.xml"/>
diff --git a/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml b/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
index cfb012280..06ed32914 100644
--- a/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
+++ b/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
@@ -7,7 +7,7 @@
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1984-01-10/ATBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5170" floppies="[1200,1200]"/>
 	<serial id="com1" adapter="1"/>
diff --git a/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.xml b/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.xml
index f7eb188b5..c5fbd0fdc 100644
--- a/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/mda/640kb/rev3/debugger/machine.xml
@@ -7,7 +7,7 @@
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/mda/ibm-mda.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pcx86/panel/wide.xml"/>
diff --git a/devices/pcx86/machine/5170/mda/640kb/rev3/machine.xml b/devices/pcx86/machine/5170/mda/640kb/rev3/machine.xml
index acf97671b..b27bb783f 100644
--- a/devices/pcx86/machine/5170/mda/640kb/rev3/machine.xml
+++ b/devices/pcx86/machine/5170/mda/640kb/rev3/machine.xml
@@ -7,7 +7,7 @@
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/mda/ibm-mda.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-functions.xml"/>
 	<chipset id="chipset" model="5170" floppies="[1200,1200]" monitor="mono"/>
 	<serial id="com1" adapter="1"/>
diff --git a/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.xml b/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.xml
index 84477ee81..1e44d62ed 100644
--- a/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/vga/2048kb/debugger/machine.xml
@@ -7,7 +7,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pcx86/panel/wide.xml"/>
diff --git a/devices/pcx86/machine/5170/vga/2048kb/machine.xml b/devices/pcx86/machine/5170/vga/2048kb/machine.xml
index f3bcced7b..cedce75c1 100644
--- a/devices/pcx86/machine/5170/vga/2048kb/machine.xml
+++ b/devices/pcx86/machine/5170/vga/2048kb/machine.xml
@@ -7,7 +7,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<hdc ref="/disks/pcx86/fixed/20mb/pcdos330-empty.xml"/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true" pos="right" padRight="8px" padBottom="8px">
diff --git a/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml b/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml
index 46e7f40ef..56c0542aa 100644
--- a/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/vga/4096kb/debugger/machine.xml
@@ -7,7 +7,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x360000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger"/>
 	<panel ref="/devices/pcx86/panel/wide.xml"/>
diff --git a/devices/pcx86/machine/5170/vga/4096kb/machine.xml b/devices/pcx86/machine/5170/vga/4096kb/machine.xml
index f4c21b2e8..bfada9bdb 100644
--- a/devices/pcx86/machine/5170/vga/4096kb/machine.xml
+++ b/devices/pcx86/machine/5170/vga/4096kb/machine.xml
@@ -7,7 +7,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x360000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pcx86/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<hdc ref="/disks/pcx86/fixed/20mb/pcdos330-empty.xml"/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true" pos="right" padRight="8px" padBottom="8px">
diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml
index 0c9f5bbbb..df166ca05 100644
--- a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml
@@ -9,7 +9,7 @@
 	<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/pcx86/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger" messages="" commands=""/>
 	<panel ref="/devices/pcx86/panel/wide386.xml"/>
diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.xml
index 6617f90dc..39cc63c5e 100644
--- a/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/ega/2048kb/machine.xml
@@ -9,7 +9,7 @@
 	<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/pcx86/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<hdc ref="/disks/pcx86/fixed/20mb/pcdos330-empty.xml"/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<chipset id="chipset" model="deskpro386" floppies="[1200,1200]"/>
diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml
index 238576b03..b5baa04e3 100644
--- a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml
@@ -9,7 +9,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x300000" comment="Extended memory at 0x100000"/>
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pcx86/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger" messages="" commands=""/>
 	<panel ref="/devices/pcx86/panel/wide386.xml"/>
diff --git a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.xml b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.xml
index f9d10673d..323e3fb73 100644
--- a/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/ega/4096kb/machine.xml
@@ -9,7 +9,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x300000" comment="Extended memory at 0x100000"/>
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pcx86/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<hdc ref="/disks/pcx86/fixed/20mb/pcdos330-empty.xml"/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
 	<chipset id="chipset" model="deskpro386" floppies="[1200,1200]"/>
diff --git a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
index 3e7657bb8..acf6f4f69 100644
--- a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
@@ -9,7 +9,7 @@
 	<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/pcx86/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pcx86/video/compaq/vga/109360-001/256kb-autolock.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "COMPAQ MS-DOS 3.31 (Disk 2)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK2.json"}, B: {name: "COMPAQ MS-DOS 3.31 (Disk 3)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK3.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "COMPAQ MS-DOS 3.31 (Disk 2)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK2.json"}, B: {name: "COMPAQ MS-DOS 3.31 (Disk 3)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK3.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault|port" commands=""/>
 	<panel ref="/devices/pcx86/panel/btpanel.xml"/>
diff --git a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
index 3343ca5ae..871777087 100644
--- a/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
@@ -9,7 +9,7 @@
 	<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/pcx86/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pcx86/video/compaq/vga/109360-001/256kb-autolock.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "COMPAQ MS-DOS 3.31 (Disk 2)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK2.json"}, B: {name: "COMPAQ MS-DOS 3.31 (Disk 3)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK3.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "COMPAQ MS-DOS 3.31 (Disk 2)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK2.json"}, B: {name: "COMPAQ MS-DOS 3.31 (Disk 3)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK3.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault|port" commands=""/>
 	<panel ref="/devices/pcx86/panel/wide386.xml"/>
diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml
index a4938ad0f..f3bfa6861 100644
--- a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml
@@ -9,7 +9,7 @@
 	<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/pcx86/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pcx86/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "COMPAQ MS-DOS 3.31 (Disk 2)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK2.json"}, B: {name: "COMPAQ MS-DOS 3.31 (Disk 3)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK3.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "COMPAQ MS-DOS 3.31 (Disk 2)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK2.json"}, B: {name: "COMPAQ MS-DOS 3.31 (Disk 3)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK3.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault|int" commands=""/>
 	<panel ref="/devices/pcx86/panel/wide386.xml"/>
diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml
index ffa74f68d..dd7d7d350 100644
--- a/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml
@@ -9,7 +9,7 @@
 	<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/pcx86/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pcx86/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "COMPAQ MS-DOS 3.31 (Disk 2)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK2.json"}, B: {name: "COMPAQ MS-DOS 3.31 (Disk 3)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK3.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "COMPAQ MS-DOS 3.31 (Disk 2)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK2.json"}, B: {name: "COMPAQ MS-DOS 3.31 (Disk 3)", path: "/disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK3.json"}}'/>
 	<hdc ref="/disks/pcx86/fixed/20mb/pcdos330-empty.xml"/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-functions.xml"/>
 	<chipset id="chipset" model="deskpro386" floppies="[1200,1200]" monitor="vga"/>
diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml
index dbd409f8f..3ad80a5e6 100644
--- a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml
@@ -9,7 +9,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x300000" comment="Extended memory at 0x100000"/>
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pcx86/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pcx86/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard id="keyboard"/>
 	<debugger id="debugger" messages="" commands=''/>
 	<panel ref="/devices/pcx86/panel/wide386.xml"/>
diff --git a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml
index 147ced1ad..a3290c0aa 100644
--- a/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml
+++ b/devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml
@@ -9,7 +9,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x300000" comment="Extended memory at 0x100000"/>
 	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pcx86/rom/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pcx86/video/ibm/vga/1986-10-27/256kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" autoMount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<hdc ref="/disks/pcx86/fixed/20mb/pcdos330-empty.xml"/>
 	<keyboard id="keyboard"/>
 	<chipset id="chipset" model="deskpro386" floppies="[1200,1200]" monitor="vga"/>
diff --git a/disks/pcx86/cpm/1.1b/debugger/machine.xml b/disks/pcx86/cpm/1.1b/debugger/machine.xml
index 78fda3862..d69c37d23 100644
--- a/disks/pcx86/cpm/1.1b/debugger/machine.xml
+++ b/disks/pcx86/cpm/1.1b/debugger/machine.xml
@@ -8,7 +8,7 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5150/basic/BASIC100.json"/>
 	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5150/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/mda/ibm-mda.xml"/>
-	<fdc id="fdcNEC" automount='{A: {name: "CP/M-86 (Disk 1)", path: "/disks/pcx86/cpm/1.1b/CPM86-DISK1.json"}, B: {name: "CP/M-86 (Disk 2)", path: "/disks/pcx86/cpm/1.1b/CPM86-DISK2.json"}}' pos="right">
+	<fdc id="fdcNEC" autoMount='{A: {name: "CP/M-86 (Disk 1)", path: "/disks/pcx86/cpm/1.1b/CPM86-DISK1.json"}, B: {name: "CP/M-86 (Disk 2)", path: "/disks/pcx86/cpm/1.1b/CPM86-DISK2.json"}}' pos="right">
 		<control type="list" binding="listDrives"/>
 		<control type="list" binding="listDisks">
 			<manifest ref="/disks/pcx86/cpm/1.1b/manifest.xml" disk="*"/>
diff --git a/disks/pcx86/cpm/1.1b/machine.xml b/disks/pcx86/cpm/1.1b/machine.xml
index 3e4bb2ead..c1ed7e7c4 100644
--- a/disks/pcx86/cpm/1.1b/machine.xml
+++ b/disks/pcx86/cpm/1.1b/machine.xml
@@ -7,7 +7,7 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5150/basic/BASIC100.json"/>
 	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5150/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/mda/ibm-mda.xml"/>
-	<fdc id="fdcNEC" automount='{A: {name: "CP/M-86 (Disk 1)", path: "/disks/pcx86/cpm/1.1b/CPM86-DISK1.json"}, B: {name: "CP/M-86 (Disk 2)", path: "/disks/pcx86/cpm/1.1b/CPM86-DISK2.json"}}' pos="right">
+	<fdc id="fdcNEC" autoMount='{A: {name: "CP/M-86 (Disk 1)", path: "/disks/pcx86/cpm/1.1b/CPM86-DISK1.json"}, B: {name: "CP/M-86 (Disk 2)", path: "/disks/pcx86/cpm/1.1b/CPM86-DISK2.json"}}' pos="right">
 		<control type="list" binding="listDrives"/>
 		<control type="list" binding="listDisks">
 			<manifest ref="/disks/pcx86/cpm/1.1b/manifest.xml" disk="*"/>
diff --git a/disks/pcx86/games/microsoft/adventure/machine.xml b/disks/pcx86/games/microsoft/adventure/machine.xml
index 08152309c..3d2072e06 100644
--- a/disks/pcx86/games/microsoft/adventure/machine.xml
+++ b/disks/pcx86/games/microsoft/adventure/machine.xml
@@ -7,7 +7,7 @@
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5150/basic/BASIC100.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5150/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/mda/ibm-mda.xml"/>
-	<fdc ref="/disks/pcx86/compiled/samples.xml" automount='{A: {name: "Microsoft Adventure", path: "/disks/pcx86/games/microsoft/adventure/ADVENTURE-1981.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/samples.xml" autoMount='{A: {name: "Microsoft Adventure", path: "/disks/pcx86/games/microsoft/adventure/ADVENTURE-1981.json"}}'/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padLeft="8px" padBottom="8px">
 		<control type="button" binding="run">Run</control>
 		<control type="button" binding="reset">Reset</control>
diff --git a/disks/pcx86/shareware/pcmag/README.md b/disks/pcx86/shareware/pcmag/README.md
index 6fbbee275..f328958cf 100644
--- a/disks/pcx86/shareware/pcmag/README.md
+++ b/disks/pcx86/shareware/pcmag/README.md
@@ -2,6 +2,12 @@
 layout: page
 title: PC Magazine Disks
 permalink: /disks/pcx86/shareware/pcmag/
+machines:
+  - id: ibm5150-pcmag
+    type: pcx86
+    resume: 1
+    config: /devices/pcx86/machine/5160/ega/640kb/machine.xml
+    autoType: $date\r$time\r
 ---
 
 PC Magazine Disks
@@ -17,6 +23,8 @@ with that diskette loaded in drive B.
 Looking at the volume numbers alone, you can tell that this collection is woefully incomplete, but perhaps more
 will surface over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 
+{% include machine.html id="ibm5150-pcmag" %}
+
 ### Directory of [PC Magazine (Vol. 06 No. 08)](/devices/pcx86/machine/5160/ega/640kb/?autoMount=%7B"B":%7B"name":"PC Magazine %28Vol. 06 No. 08%29"%7D%7D)
 
 	 Volume in drive A is VOL06N08   
diff --git a/disks/pcx86/shareware/pcsig08/README.md b/disks/pcx86/shareware/pcsig08/README.md
index 0174e6487..e7873239f 100644
--- a/disks/pcx86/shareware/pcsig08/README.md
+++ b/disks/pcx86/shareware/pcsig08/README.md
@@ -7,11 +7,7 @@ machines:
     type: pcx86
     resume: 1
     config: /disks/pcx86/shareware/pcsig08/machine.xml
-    autoMount:
-      A:
-        path: /disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json
-      B:
-        path: /disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json
+    autoType: $date\r$time\r
 ---
 
 PC-SIG Library 8th Edition CD-ROM (April 1990)
diff --git a/disks/pcx86/shareware/pcsig08/debugger/README.md b/disks/pcx86/shareware/pcsig08/debugger/README.md
index 3e3dbf01c..6c62e43f1 100644
--- a/disks/pcx86/shareware/pcsig08/debugger/README.md
+++ b/disks/pcx86/shareware/pcsig08/debugger/README.md
@@ -6,11 +6,6 @@ machines:
   - id: ibm5150-pcsig08
     type: pcx86
     config: /disks/pcx86/shareware/pcsig08/debugger/machine.xml
-    autoMount:
-      A:
-        path: /disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json
-      B:
-        path: /disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json
 ---
 
 PC-SIG Library 8th Edition CD-ROM (April 1990)
diff --git a/disks/pcx86/shareware/pcsig08/fdc.xml b/disks/pcx86/shareware/pcsig08/fdc.xml
index 754e289a7..a79a30734 100644
--- a/disks/pcx86/shareware/pcsig08/fdc.xml
+++ b/disks/pcx86/shareware/pcsig08/fdc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fdc id="fdcNEC" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"PC-DOS 2.00 (Disk 2)",path:"/disks/pcx86/dos/ibm/2.00/PCDOS200-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
+<fdc id="fdcNEC" autoMount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}' pos="left" padLeft="8px" padBottom="8px">
 	<control type="list" binding="listDrives"/>
 	<control type="list" binding="listDisks">
 		<manifest ref="/disks/pcx86/dos/ibm/1.00/manifest.xml"/>
diff --git a/disks/pcx86/shareware/pcsig08/machine.xml b/disks/pcx86/shareware/pcsig08/machine.xml
index d043d062e..b9a66f40a 100644
--- a/disks/pcx86/shareware/pcsig08/machine.xml
+++ b/disks/pcx86/shareware/pcsig08/machine.xml
@@ -3,12 +3,16 @@
 <machine id="ibm5150" type="pcx86" border="1" pos="center" background="default">
 	<name pos="center">IBM PC (Model 5150), CGA, 256K</name>
 	<computer id="pc-cga-256k" name="IBM PC"/>
-	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false" comment="no memory test"/>
 	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pcx86/rom/5150/basic/BASIC100.json"/>
 	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pcx86/rom/5150/1981-04-24/PCBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/cga/ibm-cga.xml"/>
 	<fdc ref="/disks/pcx86/shareware/pcsig08/fdc.xml"/>
 	<keyboard ref="/devices/pcx86/keyboard/us83-buttons-minimal.xml"/>
+	<cpu id="cpu8088" model="8088" autostart="true" pos="right" padRight="8px" padBottom="8px">
+		<control type="button" binding="run">Run</control>
+		<control type="button" binding="reset">Reset</control>
+		<control type="button" binding="setSpeed">Speed</control>
+	</cpu>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="10011000"/>
 </machine>
diff --git a/pubs/pc/magazines/byte/README.md b/pubs/pc/magazines/byte/README.md
index 0b8b9d54f..5f2b5663c 100644
--- a/pubs/pc/magazines/byte/README.md
+++ b/pubs/pc/magazines/byte/README.md
@@ -5,6 +5,6 @@ permalink: /pubs/pc/magazines/byte/
 ---
 
 Byte Magazine
----
+-------------
 
 [<img src="http://archive.pcjs.org/pubs/pc/magazines/byte/BYTE-1975-11/thumbs/BYTE-1975-11 1.jpeg" width="200" height="260" alt= "Byte Magazine"/>](BYTE-1975-11/)