diff --git a/build.sh b/build.sh
index be0838d..d71e343 100755
--- a/build.sh
+++ b/build.sh
@@ -208,7 +208,7 @@ cd ${WORLD_ROOT}
 
 echo ""
 echo "===================================================================="
-echo " Creating archie-${ARCHIE_VER}-${SYSTYPE}-${SOLMACHINE}-A.tgz"
+echo " Creating archie-${ARCHIE_VER}-${SYSTYPE}-${SOLMACHINE}-B.tgz"
 echo "===================================================================="
 echo ""
 cd ${RELEASE_DIR}/B
diff --git a/release/install/untar b/release/install/untar
index 6408d48..bebe47f 100755
--- a/release/install/untar
+++ b/release/install/untar
@@ -39,6 +39,10 @@ TAR=tar
 GZIP=gzip
 MIDX=9;
 
+cd "$(dirname "$0")"
+SCRIPT_DIR="$(pwd)"
+echo "Script directory: $SCRIPT_DIR"
+
 # For solaris ...
 PATH=/usr/ucb:$PATH
 
@@ -88,11 +92,11 @@ echo "      The simple script, \`unrotate' has been supplied to unrotate files i
 echo "      a given directory, should something go wrong."
 echo ""
 
-$GZIP -d < $1 | $TAR -tf - | while read file 
+$GZIP -d < $SCRIPT_DIR/$1 | $TAR -tf - | while read file 
 do
 	cd $directory
         echo $file
         test -f $file && rotate $file $idx && echo "Rotated old file $file"
 done
 
-$GZIP -d < $1 | (cd $directory ; $TAR -xvpf - )
+$GZIP -d < $SCRIPT_DIR/$1 | (cd $directory ; $TAR -xvpf - )
diff --git a/release/install/unwrap b/release/install/unwrap
index 9c3d60a..28e7b34 100755
--- a/release/install/unwrap
+++ b/release/install/unwrap
@@ -70,7 +70,7 @@ set MACHINE=`uname -m`
 
 set dirname=`dirname $0`
 
-if ( $MACHINE = "sun4m" ) then
+if ( "$MACHINE" == "sun4m" ) then
 switch ($ARCH)
    case SunOS:
 	if ( `uname -r` == 5.6 ) then
@@ -92,7 +92,7 @@ switch ($ARCH)
 endsw
 endif
 
-if ( $MACHINE = "i86pc" ) then
+if ( "$MACHINE" == "i86pc" ) then
 switch ($ARCH)
    case SunOS:
 	if ( `uname -r` == 5.11 ) then