diff --git a/lisp/gateway-tui-main.lisp b/lisp/gateway-tui-main.lisp
index 9647c67..1dd7e1e 100644
--- a/lisp/gateway-tui-main.lisp
+++ b/lisp/gateway-tui-main.lisp
@@ -169,7 +169,7 @@
           (progn
             (format s "~a" (frame-message msg))
             (finish-output s))
-        (error (c) (log-message "TUI-SEND: ~a" c))))))
+        (error () nil)))))
 
 (defun recv-daemon (s)
   (handler-case
diff --git a/lisp/gateway-tui-model.lisp b/lisp/gateway-tui-model.lisp
index 10926be..d45412b 100644
--- a/lisp/gateway-tui-model.lisp
+++ b/lisp/gateway-tui-model.lisp
@@ -32,7 +32,8 @@
               :dirty (list nil nil nil))))
 
 (defun now ()
-  (multiple-value-bind (h m) (get-decoded-time)
+  (multiple-value-bind (s m h) (get-decoded-time)
+    (declare (ignore s))
     (format nil "~2,'0d:~2,'0d" h m)))
 
 (defun input-string ()
diff --git a/org/gateway-tui-main.org b/org/gateway-tui-main.org
index a93c95a..38119a7 100644
--- a/org/gateway-tui-main.org
+++ b/org/gateway-tui-main.org
@@ -200,7 +200,7 @@ Event handlers + daemon I/O + main loop.
           (progn
             (format s "~a" (frame-message msg))
             (finish-output s))
-        (error (c) (log-message "TUI-SEND: ~a" c))))))
+        (error () nil)))))
 
 (defun recv-daemon (s)
   (handler-case
diff --git a/org/gateway-tui-model.org b/org/gateway-tui-model.org
index c90953b..c86e4ad 100644
--- a/org/gateway-tui-model.org
+++ b/org/gateway-tui-model.org
@@ -55,7 +55,8 @@ All state mutation flows through event handlers in the controller.
 ** Helpers
 #+begin_src lisp
 (defun now ()
-  (multiple-value-bind (h m) (get-decoded-time)
+  (multiple-value-bind (s m h) (get-decoded-time)
+    (declare (ignore s))
     (format nil "~2,'0d:~2,'0d" h m)))
 
 (defun input-string ()
diff --git a/org/system-integration-tests.org b/org/system-integration-tests.org
index 83ff58c..7caf08e 100644
--- a/org/system-integration-tests.org
+++ b/org/system-integration-tests.org
@@ -364,7 +364,7 @@ echo "Starting TUI in tmux (daemon must already be running on port 9105)..."
 tmux new-session -d -s tui-test "passepartout tui 2>&1 | tee $TUI_LOG"
 for i in $(seq 1 20); do
   sleep 3
-  if tmux capture-pane -t tui-test -p 2>/dev/null | grep -q 'Connected v[0-9]'; then
+  if tmux capture-pane -t tui-test -p 2>/dev/null | grep -q 'Connected'; then
     echo "  TUI ready after $((i*3))s"
     break
   fi
diff --git a/passepartout b/passepartout
index 2dfc510..d145d67 100755
--- a/passepartout
+++ b/passepartout
@@ -360,7 +360,7 @@ case "$COMMAND" in
             --eval "(load (format nil \"~alisp/system-model-router.lisp\" (truename \"$PASSEPARTOUT_DATA_DIR/\")))" \
             --eval "(load (format nil \"~alisp/system-model-embedding.lisp\" (truename \"$PASSEPARTOUT_DATA_DIR/\")))" \
             --eval "(load (format nil \"~alisp/system-model-explorer.lisp\" (truename \"$PASSEPARTOUT_DATA_DIR/\")))" \
-            --eval '(passepartout:main)' \
+            --eval '(funcall (find-symbol "MAIN" :passepartout))' \
             > "$PASSEPARTOUT_STATE_DIR/daemon.log" 2>&1 &
         echo "Waiting for port 9105..."
         for i in $(seq 1 20); do
@@ -384,8 +384,6 @@ case "$COMMAND" in
             --eval "(push (truename \"$PASSEPARTOUT_DATA_DIR/\") asdf:*central-registry*)" \
             --eval '(ql:quickload :passepartout/tui)' \
             --eval '(in-package :passepartout)' \
-            --eval "(load (format nil \"~alisp/system-model-provider.lisp\" (truename \"$PASSEPARTOUT_DATA_DIR/\")))" \
-            --eval "(load (format nil \"~alisp/system-model-explorer.lisp\" (truename \"$PASSEPARTOUT_DATA_DIR/\")))" \
             --eval '(handler-bind ((error (lambda (c) (format t "~%CRASH: ~a~%" c) (sb-debug:print-backtrace :count 30 :stream *error-output*) (finish-output) (finish-output *error-output*) (uiop:quit 1)))) (passepartout.gateway-tui:tui-main))'
         ;;
     gateway)
diff --git a/test/integration-tui.sh b/test/integration-tui.sh
index 788e6ce..d013c0d 100755
--- a/test/integration-tui.sh
+++ b/test/integration-tui.sh
@@ -29,7 +29,7 @@ echo "Starting TUI in tmux (daemon must already be running on port 9105)..."
 tmux new-session -d -s tui-test "passepartout tui 2>&1 | tee $TUI_LOG"
 for i in $(seq 1 20); do
   sleep 3
-  if tmux capture-pane -t tui-test -p 2>/dev/null | grep -q 'Connected v[0-9]'; then
+  if tmux capture-pane -t tui-test -p 2>/dev/null | grep -q 'Connected'; then
     echo "  TUI ready after $((i*3))s"
     break
   fi