diff --git a/release/sysinstall/dispatch.c b/release/sysinstall/dispatch.c
index 4776dadac5f5..a23b89bdd48c 100644
--- a/release/sysinstall/dispatch.c
+++ b/release/sysinstall/dispatch.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dispatch.c,v 1.13 1997/05/22 00:17:06 jkh Exp $
+ * $Id: dispatch.c,v 1.14 1997/06/05 09:47:56 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -144,6 +144,8 @@ dispatchCommand(char *str)
 
     /* If it's got a `=' sign in there, assume it's a variable setting */
     if (index(str, '=')) {
+	if (isDebug())
+	    msgDebug("dispatch: setting variable `%s'\n", str);
 	variable_set(str);
 	i = DITEM_SUCCESS;
     }
@@ -151,6 +153,8 @@ dispatchCommand(char *str)
 	/* A command might be a pathname if it's encoded in argv[0], which we also support */
 	if ((cp = rindex(str, '/')) != NULL)
 	    str = cp + 1;
+	if (isDebug())
+	    msgDebug("dispatch: calling resword `%s'\n", str);
 	if (!call_possible_resword(str, NULL, &i)) {
 	    msgNotify("Warning: No such command ``%s''", str);
 	    i = DITEM_FAILURE;
diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c
index 26405165cd18..c28455599ec6 100644
--- a/release/sysinstall/tcpip.c
+++ b/release/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tcpip.c,v 1.65 1997/03/09 22:25:49 jkh Exp $
+ * $Id: tcpip.c,v 1.66 1997/06/09 01:19:44 jkh Exp $
  *
  * Copyright (c) 1995
  *      Gary J Palmer. All rights reserved.
@@ -213,12 +213,12 @@ tcpOpenDialog(Device *devp)
     else
 	bzero(nameserver, sizeof(nameserver));
 
+    save = savescr();
     /* If non-interactive, jump straight over the dialog crap and into config section */
     if (variable_get(VAR_NONINTERACTIVE))
 	goto netconfig;
 
     /* Now do all the screen I/O */
-    save = savescr();
     dialog_clear_norefresh();
 
     /* We need a curses window */
diff --git a/usr.sbin/sade/dispatch.c b/usr.sbin/sade/dispatch.c
index 4776dadac5f5..a23b89bdd48c 100644
--- a/usr.sbin/sade/dispatch.c
+++ b/usr.sbin/sade/dispatch.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dispatch.c,v 1.13 1997/05/22 00:17:06 jkh Exp $
+ * $Id: dispatch.c,v 1.14 1997/06/05 09:47:56 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -144,6 +144,8 @@ dispatchCommand(char *str)
 
     /* If it's got a `=' sign in there, assume it's a variable setting */
     if (index(str, '=')) {
+	if (isDebug())
+	    msgDebug("dispatch: setting variable `%s'\n", str);
 	variable_set(str);
 	i = DITEM_SUCCESS;
     }
@@ -151,6 +153,8 @@ dispatchCommand(char *str)
 	/* A command might be a pathname if it's encoded in argv[0], which we also support */
 	if ((cp = rindex(str, '/')) != NULL)
 	    str = cp + 1;
+	if (isDebug())
+	    msgDebug("dispatch: calling resword `%s'\n", str);
 	if (!call_possible_resword(str, NULL, &i)) {
 	    msgNotify("Warning: No such command ``%s''", str);
 	    i = DITEM_FAILURE;
diff --git a/usr.sbin/sysinstall/dispatch.c b/usr.sbin/sysinstall/dispatch.c
index 4776dadac5f5..a23b89bdd48c 100644
--- a/usr.sbin/sysinstall/dispatch.c
+++ b/usr.sbin/sysinstall/dispatch.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dispatch.c,v 1.13 1997/05/22 00:17:06 jkh Exp $
+ * $Id: dispatch.c,v 1.14 1997/06/05 09:47:56 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -144,6 +144,8 @@ dispatchCommand(char *str)
 
     /* If it's got a `=' sign in there, assume it's a variable setting */
     if (index(str, '=')) {
+	if (isDebug())
+	    msgDebug("dispatch: setting variable `%s'\n", str);
 	variable_set(str);
 	i = DITEM_SUCCESS;
     }
@@ -151,6 +153,8 @@ dispatchCommand(char *str)
 	/* A command might be a pathname if it's encoded in argv[0], which we also support */
 	if ((cp = rindex(str, '/')) != NULL)
 	    str = cp + 1;
+	if (isDebug())
+	    msgDebug("dispatch: calling resword `%s'\n", str);
 	if (!call_possible_resword(str, NULL, &i)) {
 	    msgNotify("Warning: No such command ``%s''", str);
 	    i = DITEM_FAILURE;
diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c
index 26405165cd18..c28455599ec6 100644
--- a/usr.sbin/sysinstall/tcpip.c
+++ b/usr.sbin/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tcpip.c,v 1.65 1997/03/09 22:25:49 jkh Exp $
+ * $Id: tcpip.c,v 1.66 1997/06/09 01:19:44 jkh Exp $
  *
  * Copyright (c) 1995
  *      Gary J Palmer. All rights reserved.
@@ -213,12 +213,12 @@ tcpOpenDialog(Device *devp)
     else
 	bzero(nameserver, sizeof(nameserver));
 
+    save = savescr();
     /* If non-interactive, jump straight over the dialog crap and into config section */
     if (variable_get(VAR_NONINTERACTIVE))
 	goto netconfig;
 
     /* Now do all the screen I/O */
-    save = savescr();
     dialog_clear_norefresh();
 
     /* We need a curses window */