diff --git a/minix/commands/setup/setup.sh b/minix/commands/setup/setup.sh
index bf662f493..0fa2501f1 100644
--- a/minix/commands/setup/setup.sh
+++ b/minix/commands/setup/setup.sh
@@ -739,7 +739,7 @@ fi
 chroot /mnt update_bootcfg
 
 # Save name of CD drive
-cddrive="`mount | grep /usr | awk '{ print $1 }' | sed 's/p.*//'`"
+cddrive="`mount | fgrep ' /usr ' | awk '{ print $1 }' | sed 's/p.*//'`"
 echo "cddrive=$cddrive" >>/mnt/usr/etc/rc.package
 
 bios="`echo $primary | sed -e 's/d./dX/g' -e 's/c.//g'`"
diff --git a/releasetools/release.functions b/releasetools/release.functions
index 151b9f983..fde32d4a3 100644
--- a/releasetools/release.functions
+++ b/releasetools/release.functions
@@ -135,7 +135,7 @@ copy_local_packages()
 				  exit 1
 			      fi
 	
-			      if [ "`wc -l $indexname`" -lt 3 ]
+			      if [ "`wc -l <$indexname`" -lt 3 ]
 			      then	$indexname is too short.
 				  rm $indexname
 				  exit 1