diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c
index 161560dc91d..0750fe1305c 100644
--- a/release/sysinstall/label.c
+++ b/release/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.73 1997/09/09 16:32:01 jkh Exp $
+ * $Id: label.c,v 1.74 1997/09/16 10:14:21 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -238,8 +238,6 @@ record_label_chunks(Device **devs)
     label_chunk_info[j].c = NULL;
     if (here >= j) {
 	here = j  ? j - 1 : 0;
-        pslice_focus = here;            /* VEG 09/05/97 */
-        label_focus = here;            /* VEG 09/05/97 */
     }
     if (ChunkWin) {
 	wclear(ChunkWin);
@@ -607,6 +605,8 @@ diskLabel(char *str)
     Device **devs;
     int override_focus_adjust = 0;
 
+    label_focus = 0;
+    pslice_focus = 0;
     devs = deviceFind(NULL, DEVICE_TYPE_DISK);
     if (!devs) {
 	msgConfirm("No disks found!");
@@ -1067,7 +1067,7 @@ diskLabel(char *str)
 	    msg = _msg;
 	    break;
 	}
-	if (override_focus_adjust) {
+	if (!override_focus_adjust) {
             if (label_chunk_info[here].type == PART_SLICE)
                 pslice_focus = here;
             else
diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c
index 6da5398c0e5..e61b7679d24 100644
--- a/release/sysinstall/msg.c
+++ b/release/sysinstall/msg.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: msg.c,v 1.45 1997/04/20 16:46:35 jkh Exp $
+ * $Id: msg.c,v 1.46 1997/09/09 16:27:50 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -214,7 +214,7 @@ msgNotify(char *fmt, ...)
     if (isDebug())
 	msgDebug("Notify: %s\n", errstr);
     dialog_clear_norefresh();
-    dialog_msgbox(" ", errstr, -1, -1, 0);
+    dialog_msgbox(NULL, errstr, -1, -1, 0);
 }
 
 /* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
@@ -301,7 +301,7 @@ msgWeHaveOutput(char *fmt, ...)
     use_helpfile(NULL);
     msgDebug("Notify: %s\n", errstr);
     dialog_clear_norefresh();
-    dialog_msgbox(" ", errstr, -1, -1, 0);
+    dialog_msgbox(NULL, errstr, -1, -1, 0);
 }
 
 /* Simple versions of msgConfirm() and msgNotify() for calling from scripts */
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 161560dc91d..0750fe1305c 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.73 1997/09/09 16:32:01 jkh Exp $
+ * $Id: label.c,v 1.74 1997/09/16 10:14:21 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -238,8 +238,6 @@ record_label_chunks(Device **devs)
     label_chunk_info[j].c = NULL;
     if (here >= j) {
 	here = j  ? j - 1 : 0;
-        pslice_focus = here;            /* VEG 09/05/97 */
-        label_focus = here;            /* VEG 09/05/97 */
     }
     if (ChunkWin) {
 	wclear(ChunkWin);
@@ -607,6 +605,8 @@ diskLabel(char *str)
     Device **devs;
     int override_focus_adjust = 0;
 
+    label_focus = 0;
+    pslice_focus = 0;
     devs = deviceFind(NULL, DEVICE_TYPE_DISK);
     if (!devs) {
 	msgConfirm("No disks found!");
@@ -1067,7 +1067,7 @@ diskLabel(char *str)
 	    msg = _msg;
 	    break;
 	}
-	if (override_focus_adjust) {
+	if (!override_focus_adjust) {
             if (label_chunk_info[here].type == PART_SLICE)
                 pslice_focus = here;
             else
diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c
index 6da5398c0e5..e61b7679d24 100644
--- a/usr.sbin/sade/msg.c
+++ b/usr.sbin/sade/msg.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: msg.c,v 1.45 1997/04/20 16:46:35 jkh Exp $
+ * $Id: msg.c,v 1.46 1997/09/09 16:27:50 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -214,7 +214,7 @@ msgNotify(char *fmt, ...)
     if (isDebug())
 	msgDebug("Notify: %s\n", errstr);
     dialog_clear_norefresh();
-    dialog_msgbox(" ", errstr, -1, -1, 0);
+    dialog_msgbox(NULL, errstr, -1, -1, 0);
 }
 
 /* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
@@ -301,7 +301,7 @@ msgWeHaveOutput(char *fmt, ...)
     use_helpfile(NULL);
     msgDebug("Notify: %s\n", errstr);
     dialog_clear_norefresh();
-    dialog_msgbox(" ", errstr, -1, -1, 0);
+    dialog_msgbox(NULL, errstr, -1, -1, 0);
 }
 
 /* Simple versions of msgConfirm() and msgNotify() for calling from scripts */
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index 161560dc91d..0750fe1305c 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.73 1997/09/09 16:32:01 jkh Exp $
+ * $Id: label.c,v 1.74 1997/09/16 10:14:21 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -238,8 +238,6 @@ record_label_chunks(Device **devs)
     label_chunk_info[j].c = NULL;
     if (here >= j) {
 	here = j  ? j - 1 : 0;
-        pslice_focus = here;            /* VEG 09/05/97 */
-        label_focus = here;            /* VEG 09/05/97 */
     }
     if (ChunkWin) {
 	wclear(ChunkWin);
@@ -607,6 +605,8 @@ diskLabel(char *str)
     Device **devs;
     int override_focus_adjust = 0;
 
+    label_focus = 0;
+    pslice_focus = 0;
     devs = deviceFind(NULL, DEVICE_TYPE_DISK);
     if (!devs) {
 	msgConfirm("No disks found!");
@@ -1067,7 +1067,7 @@ diskLabel(char *str)
 	    msg = _msg;
 	    break;
 	}
-	if (override_focus_adjust) {
+	if (!override_focus_adjust) {
             if (label_chunk_info[here].type == PART_SLICE)
                 pslice_focus = here;
             else
diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index 6da5398c0e5..e61b7679d24 100644
--- a/usr.sbin/sysinstall/msg.c
+++ b/usr.sbin/sysinstall/msg.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: msg.c,v 1.45 1997/04/20 16:46:35 jkh Exp $
+ * $Id: msg.c,v 1.46 1997/09/09 16:27:50 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -214,7 +214,7 @@ msgNotify(char *fmt, ...)
     if (isDebug())
 	msgDebug("Notify: %s\n", errstr);
     dialog_clear_norefresh();
-    dialog_msgbox(" ", errstr, -1, -1, 0);
+    dialog_msgbox(NULL, errstr, -1, -1, 0);
 }
 
 /* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
@@ -301,7 +301,7 @@ msgWeHaveOutput(char *fmt, ...)
     use_helpfile(NULL);
     msgDebug("Notify: %s\n", errstr);
     dialog_clear_norefresh();
-    dialog_msgbox(" ", errstr, -1, -1, 0);
+    dialog_msgbox(NULL, errstr, -1, -1, 0);
 }
 
 /* Simple versions of msgConfirm() and msgNotify() for calling from scripts */