diff --git a/qubesmanager/main.py b/qubesmanager/main.py
index dd11c18..c919621 100755
--- a/qubesmanager/main.py
+++ b/qubesmanager/main.py
@@ -1305,7 +1305,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
     def do_update_vm(self, vm, thread_monitor):
         try:
             if vm.qid == 0:
-                subprocess.check_call (["/usr/bin/qvm-dom0-update", "--gui"])
+                subprocess.check_call (["/usr/bin/qubes-dom0-update", "--gui"])
             else:
                 vm.run("user:gpk-update-viewer", verbose=False, autostart=True)
         except Exception as ex:
diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py
index 2c712e8..454316c 100644
--- a/qubesmanager/settings.py
+++ b/qubesmanager/settings.py
@@ -379,9 +379,14 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
         self.config_path.setText(self.vm.conf_file)
         if self.vm.template is not None:
             self.root_img_path.setText(self.vm.template.root_img)
+        elif self.vm.root_img is not None:
+            self.root_img_path.setText(self.vm.root_img)
         else:
             self.root_img_path.setText("n/a")
-        self.volatile_img_path.setText(self.vm.volatile_img)
+        if self.vm.volatile_img is not None:
+            self.volatile_img_path.setText(self.vm.volatile_img)
+        else:
+            self.volatile_img_path.setText('n/a')
         self.private_img_path.setText(self.vm.private_img)
 
 
diff --git a/version b/version
index 963ed7c..c114700 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.2.10
+1.2.11