diff --git a/conf/etc/passwd b/conf/etc/passwd
index bd515bb..a00f5b5 100644
--- a/conf/etc/passwd
+++ b/conf/etc/passwd
@@ -1,5 +1,5 @@
 root:x:0:0:root:/root:/bin/bash
-test:x:0:0:test:/root:/usr/local/bin/wrapper-screen
+test:x:0:0:test:/root:/usr/local/bin/screen-mem-hdd
 bin:x:1:1:bin:/bin:/sbin/nologin
 daemon:x:2:2:daemon:/sbin:/sbin/nologin
 adm:x:3:4:adm:/var/adm:/sbin/nologin
diff --git a/scripts/wrapper-badblocks b/scripts/wrapper-badblocks
index 579a7ad..98ec8a6 100755
--- a/scripts/wrapper-badblocks
+++ b/scripts/wrapper-badblocks
@@ -157,6 +157,7 @@ if [[ -f /run/$SERIAL.badblocks.out ]] ; then
 		>> $OUTPUT_DIR/disk/$SERIAL.badblocks.out
 	ln -sf $OUTPUT_DIR/disk/$SERIAL.badblocks.out \
 		$OUTPUT_DIR/disk/$DISK.badblocks.out
+	rm -f /run/$SERIAL.badblocks.out
 fi
 #ln -sf $OUTPUT_DIR/disk/$SERIAL.badblocks.ret \
 #	$OUTPUT_DIR/disk/$DISK.badblocks.ret