diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py
index 03cd601e..6edaebfd 100755
--- a/dom0/qvm-core/qubes.py
+++ b/dom0/qvm-core/qubes.py
@@ -2412,6 +2412,8 @@ class QubesHVm(QubesVm):
         attrs.remove('kernelopts')
         attrs.remove('uses_default_kernelopts')
         attrs += [ 'timezone' ]
+        attrs += [ 'qrexec_installed' ]
+        attrs += [ 'guiagent_installed' ]
         return attrs
 
     def create_on_disk(self, verbose, source_template = None):
@@ -2582,8 +2584,7 @@ class QubesHVm(QubesVm):
                 if kwargs.get('verbose'):
                     print >> sys.stderr, "--> Waiting for user '%s' login..." % self.default_user
 
-                # TODO retrieve the notify_function from kwargs ?
-                self.wait_for_session(**kwargs)
+                self.wait_for_session(notify_function=kwargs.get('notify_function', None))
 
     def pause(self):
         if dry_run: