diff --git a/gns3server/modules/qemu/__init__.py b/gns3server/modules/qemu/__init__.py
index 69abd613..2d643204 100644
--- a/gns3server/modules/qemu/__init__.py
+++ b/gns3server/modules/qemu/__init__.py
@@ -100,7 +100,7 @@ class Qemu(BaseManager):
             return ""
         try:
             output = yield from subprocess_check_output(qemu_path, "-version")
-            match = re.search("version\s+([0-9a-z\-\.]+)", output.decode("utf-8"))
+            match = re.search("version\s+([0-9a-z\-\.]+)", output)
             if match:
                 version = match.group(1)
                 return version
diff --git a/gns3server/modules/qemu/qemu_vm.py b/gns3server/modules/qemu/qemu_vm.py
index 23ddf018..2464b725 100644
--- a/gns3server/modules/qemu/qemu_vm.py
+++ b/gns3server/modules/qemu/qemu_vm.py
@@ -601,7 +601,7 @@ class QemuVM(BaseVM):
             log.info("stopping QEMU VM instance {} PID={}".format(self._id, self._process.pid))
             try:
                 self._process.terminate()
-                self._process.wait(1)
+                self._process.wait()
             except subprocess.TimeoutExpired:
                 self._process.kill()
                 if self._process.poll() is None: