More QEMU fixes