diff --git a/release/fixit.profile b/release/fixit.profile
index 9ee433f0743..be1cbc58fac 100644
--- a/release/fixit.profile
+++ b/release/fixit.profile
@@ -1,13 +1,13 @@
 :
-# $Id: fixit.profile,v 1.5 1997/02/22 14:10:25 peter Exp $
+# $Id: fixit.profile,v 1.6 1997/03/02 11:59:26 joerg Exp $
 
 export BLOCKSIZE=K
 export PS1="Fixit# "
 export EDITOR="/mnt2/stand/vi"
 export PAGER="/mnt2/stand/more"
 export SCSI_MODES="/mnt2/usr/share/misc/scsi_modes"
-# the root MFS doesn't have /dev/nrst0, pick a better default for mt(1)
-export TAPE=/mnt2/dev/nrst0
+# the root MFS doesn't have /dev/nrsa0, pick a better default for mt(1)
+export TAPE=/mnt2/dev/nrsa0
 
 alias ls="ls -F"
 alias ll="ls -l"
diff --git a/release/sysinstall/floppy.c b/release/sysinstall/floppy.c
index f3b210fa5db..ca958edad2c 100644
--- a/release/sysinstall/floppy.c
+++ b/release/sysinstall/floppy.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: floppy.c,v 1.31 1998/12/22 12:31:24 jkh Exp $
+ * $Id: floppy.c,v 1.32 1999/02/15 00:49:33 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -148,7 +148,7 @@ mediaShutdownFloppy(Device *dev)
 	    msgDebug("Umount of floppy on %s failed: %s (%d)\n", mp, strerror(errno), errno);
 	else {
 	    floppyMounted = FALSE;
-	    if (!variable_get(VAR_NONINTERACTIVE))
+	    if (!variable_get(VAR_NONINTERACTIVE) && variable_cmp(SYSTEM_STATE, "fixit"))
 		msgConfirm("You may remove the floppy from %s", dev->description);
 	}
     }
diff --git a/usr.sbin/sysinstall/floppy.c b/usr.sbin/sysinstall/floppy.c
index f3b210fa5db..ca958edad2c 100644
--- a/usr.sbin/sysinstall/floppy.c
+++ b/usr.sbin/sysinstall/floppy.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: floppy.c,v 1.31 1998/12/22 12:31:24 jkh Exp $
+ * $Id: floppy.c,v 1.32 1999/02/15 00:49:33 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -148,7 +148,7 @@ mediaShutdownFloppy(Device *dev)
 	    msgDebug("Umount of floppy on %s failed: %s (%d)\n", mp, strerror(errno), errno);
 	else {
 	    floppyMounted = FALSE;
-	    if (!variable_get(VAR_NONINTERACTIVE))
+	    if (!variable_get(VAR_NONINTERACTIVE) && variable_cmp(SYSTEM_STATE, "fixit"))
 		msgConfirm("You may remove the floppy from %s", dev->description);
 	}
     }