diff --git a/projects/nat-archive-tool/src/nat/ArchiveController.kiss b/projects/nat-archive-tool/src/nat/ArchiveController.kiss
index 8a1b23e4..4be501b6 100644
--- a/projects/nat-archive-tool/src/nat/ArchiveController.kiss
+++ b/projects/nat-archive-tool/src/nat/ArchiveController.kiss
@@ -107,7 +107,7 @@
             &mut lastCollector
                 (lambda []
                     (set lastChangeSet (the ChangeSet (Reflect.callMethod null command.handler collectedArgs)))
-                    (ui.handleChanges archive lastChangeSet))]
+                    (when lastChangeSet (ui.handleChanges archive lastChangeSet)))]
         // To facilitate asynchronous arg input via UI, we need to construct an insanely complicated nested callback to give the UI
         (doFor arg (reversed command.args)
             (set lastCollector (_composeArgCollector collectedArgs arg lastCollector)))
diff --git a/projects/nat-archive-tool/src/nat/CLI.kiss b/projects/nat-archive-tool/src/nat/CLI.kiss
index 8ab855e2..45df310e 100644
--- a/projects/nat-archive-tool/src/nat/CLI.kiss
+++ b/projects/nat-archive-tool/src/nat/CLI.kiss
@@ -82,6 +82,7 @@
 
         
 (method handleChanges [:Archive archive :ChangeSet changeSet]
+    (archive.processSystems)
     (doFor e changeSet
         (print (archive.fullString e))))
 
diff --git a/projects/nat-archive-tool/src/nat/System.kiss b/projects/nat-archive-tool/src/nat/System.kiss
index 3577251e..c24db8e1 100644
--- a/projects/nat-archive-tool/src/nat/System.kiss
+++ b/projects/nat-archive-tool/src/nat/System.kiss
@@ -2,8 +2,7 @@
 
 (method :Void process [:Archive archive]
     (doFor e (entries.iterator)
-        (processEntry archive e)
-        (archive.refreshEntry e)))
+        (processEntry archive e)))
 
 (defNew [&prop :EntryChecker canProcessEntry
             &prop :EntryProcessor processEntry]
@@ -18,4 +17,4 @@
             (entries.remove e.id)
             (when onRemoveEntry (onRemoveEntry archive e)))))
 
-// TODO systems may need access to a UI
+// TODO systems may need access to a UI or ArchiveController