diff --git a/virtual-machines/Win2000-run b/virtual-machines/Win2000-run
index a034348..bde0616 100755
--- a/virtual-machines/Win2000-run
+++ b/virtual-machines/Win2000-run
@@ -6,12 +6,12 @@ source ../qemu-setup
 run-qemu i386 \
 	--drive file=image,format=qcow2,media=disk \
 	--drive file="$m/MS Windows/2000 Pro/5.00.2195.iso",media=cdrom,readonly \
-	-m 384 \
 	--boot order=d \
+	-m 384 \
+	--usb \
 	--vga cirrus \
 	--net nic,model=rtl8139 \
 	--net user \
-	--usb \
 	--soundhw ac97
 
 ## EOF
diff --git a/virtual-machines/Win98-run b/virtual-machines/Win98-run
index 5ba7c8e..de7fa24 100755
--- a/virtual-machines/Win98-run
+++ b/virtual-machines/Win98-run
@@ -5,14 +5,14 @@ source ../qemu-setup
 
 run-qemu i386 \
 	--drive file=image,format=qcow2,media=disk \
-	--drive file="$m/Boot Disks/98SE.img",format=raw,if=floppy,readonly \
+	--drive file="$m/Boot Disks/Win/98SE.img",format=raw,if=floppy,readonly \
 	--drive file="$m/MS Windows/98 2nd Edition/98SE.iso",media=cdrom,readonly \
-	-m 384 \
 	--boot order=d \
+	-m 384 \
+	--usb \
 	--vga cirrus \
 	--net nic,model=rtl8139 \
 	--net user \
-	--usb \
 	--soundhw ac97
 
 ## EOF
diff --git a/virtual-machines/qemu-setup b/virtual-machines/qemu-setup
index 62ecf02..1aa9cb4 100644
--- a/virtual-machines/qemu-setup
+++ b/virtual-machines/qemu-setup
@@ -1,13 +1,17 @@
 # vim: syntax=fish:
 
 function run-qemu
-	set arch (shift)
-	env \
-		QEMU_AUDIO_DRV=pa \
-		"qemu-system-$arch" \
-			--machine accel=kvm \
-			--display sdl,gl=on \
-			$argv
+	set arch $argv[1]
+	set -e argv[1]
+
+	set argv --display sdl,gl=on $argv
+
+	if test $arch = "i386"
+		or test $arch = "x86_64"
+		set argv --machine accel=kvm $argv
+	end
+
+	env QEMU_AUDIO_DRV=pa "qemu-system-$arch" $argv
 end
 
 set m "/mnt/s/osmedia"