diff --git a/subiquity/cmd/server.py b/subiquity/cmd/server.py
index c2f29b20..e6634a1d 100644
--- a/subiquity/cmd/server.py
+++ b/subiquity/cmd/server.py
@@ -148,6 +148,7 @@ def main():
     logger.info("Starting Subiquity server revision {}".format(version))
     logger.info("Arguments passed: {}".format(sys.argv))
     logger.debug("Kernel commandline: {}".format(opts.kernel_cmdline))
+    logger.debug("Storage version: {}".format(opts.storage_version))
 
     server = SubiquityServer(opts, block_log_dir)
 
diff --git a/subiquity/server/controllers/filesystem.py b/subiquity/server/controllers/filesystem.py
index 0e00abec..a6728fd7 100644
--- a/subiquity/server/controllers/filesystem.py
+++ b/subiquity/server/controllers/filesystem.py
@@ -461,7 +461,8 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
             break
 
     def run_guided(self, layout):
-        guided_method = getattr(self, "guided_" + layout['name'])
+        name = layout['name']
+        guided_method = getattr(self, "guided_" + name)
         mode = layout.get('mode', 'reformat_disk')
         self.validate_layout_mode(mode)
 
@@ -481,6 +482,8 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
             # This is not necessarily the exact gap to be used, as the gap size
             # may change once add_boot_disk has sorted things out.
             disk = gap.device
+        log.info(f'autoinstall: running guided {name} install in mode {mode} '
+                 f'using {disk}')
         guided_method(disk=disk, mode=mode)
 
     def validate_layout_mode(self, mode):