diff --git a/subiquity/server/controllers/filesystem.py b/subiquity/server/controllers/filesystem.py
index cf5164cf..b125d637 100644
--- a/subiquity/server/controllers/filesystem.py
+++ b/subiquity/server/controllers/filesystem.py
@@ -208,6 +208,11 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
         if self._system.storage_encryption.support == \
            StorageEncryptionSupport.DEFECTIVE:
             self._core_boot_classic_error = system_defective_encryption_text
+        if self._system.storage_encryption.support == \
+           StorageEncryptionSupport.UNAVAILABLE:
+            log.debug(
+                "storage encryption unavailable: %r",
+                self._system.storage_encryption.unavailable_reason)
 
     @with_context()
     async def apply_autoinstall_config(self, context=None):
diff --git a/subiquity/server/controllers/install.py b/subiquity/server/controllers/install.py
index 2396955e..389c93b8 100644
--- a/subiquity/server/controllers/install.py
+++ b/subiquity/server/controllers/install.py
@@ -266,7 +266,7 @@ class InstallController(SubiquityController):
                         self.acquire_filesystem_config,
                         mode=ActionRenderMode.DEVICES),
                     cls=CurtinPartitioningStep,
-                    device_map_path=logs_dir / "device-map.json",
+                    device_map_path=logs_dir / "device-map-partition.json",
                     ).run,
                 )
             if fs_controller.use_tpm:
@@ -278,7 +278,7 @@ class InstallController(SubiquityController):
                         self.acquire_filesystem_config,
                         mode=ActionRenderMode.FORMAT_MOUNT),
                     cls=CurtinPartitioningStep,
-                    device_map_path=logs_dir / "device-map.json",
+                    device_map_path=logs_dir / "device-map-format.json",
                     ).run,
                 make_curtin_step(
                     name="extract", stages=["extract"],
diff --git a/subiquity/server/controllers/refresh.py b/subiquity/server/controllers/refresh.py
index 9ececef3..e1623206 100644
--- a/subiquity/server/controllers/refresh.py
+++ b/subiquity/server/controllers/refresh.py
@@ -149,7 +149,7 @@ class RefreshController(SubiquityController):
         expected_channel = 'stable/ubuntu-' + info['release']
         if source == SnapChannelSource.DISK_INFO_FILE \
            and snap.channel != expected_channel:
-            log.debug(f"snap tracking {expected_channel}, not resetting based "
+            log.debug(f"snap tracking {snap.channel}, not resetting based "
                       "on .disk/info")
             return
         desc = "switching {} to {}".format(self.snap_name, channel)