diff --git a/virt/v2v/output_qemu.ml b/virt/v2v/output_qemu.ml
index be3a3c5..8b95f01 100644
--- a/v2v/output_qemu.ml
+++ b/v2v/output_qemu.ml
@@ -144,7 +144,7 @@ object
                           "media=disk"]
 
     | BusSlotRemovable { s_removable_type = CDROM } ->
-       arg_list "-drive" ["format=raw"; "if=" ^ if_name;
+       arg_list "-drive" ["if=" ^ if_name;
                           "index=" ^ string_of_int i; "media=cdrom"]
 
     | BusSlotRemovable { s_removable_type = Floppy } ->
@@ -242,9 +242,7 @@ object
       arg_list "-device" ["virtio-rng-pci"; "rng=rng0"];
     );
     if guestcaps.gcaps_virtio_balloon then
-      arg "-balloon" "virtio"
-    else
-      arg "-balloon" "none";
+      arg "-device" "virtio-balloon";
     if guestcaps.gcaps_isa_pvpanic then
       arg_list "-device" ["pvpanic"; "ioport=0x505"];