diff --git a/ts/build/packages/base/etc/profile b/ts/build/packages/base/etc/profile
index ec364e1411..109d64fb4c 100644
--- a/ts/build/packages/base/etc/profile
+++ b/ts/build/packages/base/etc/profile
@@ -34,28 +34,33 @@ if [ "`tty`" == "$CONSOLE" ]; then
 		echo "Fastboot was enabled, but something went wrong with the transfer or mount."
 		echo "Hopefully only Administrators ever see this message, and then only when they fail. :)"
 		echo "Review the log at /var/log/fastboot.log"
-		if [ "$LM" == "2" ] && ! mountpoint /boot; then
-			if ! module_available vfat; then
+		case $LM in
+		2)	if ! module_available vfat; then
 				echo "syslinux: vfat module not available"
 			else
 				echo "syslinux: /boot was not mounted, maybe check your mount declarations"
 			fi
-		elif [ "$LM" == "3" ] && ! pkg_initialized autonet; then
+		;;
+		3)
 			if pkg_is_loaded networkmanager; then
 				echo "pxelinux: Package networkmager does not work with this technology, try autonet"
-			else
+			elif ! pkg_initialized autonet; then
 				echo "pxelinux: Package autonet not available"
+			else
+				echo "pxelinux: Maybe we didn't get the server"
 			fi
-		elif [ "$LM" == "4" ] && ! mountpoint /mnt/cdrom0; then
+		;;
+		4)
 			if ! module_available isofs && ! module_available udf; then
 				echo "isolinux: No CD Rom modules available"
 			else
-				echo "isolinux: /mnt/cdrom0 was not mounted, maybe"
 				echo "isolinux: /mnt/cdrom0 was not mounted, maybe check your mount declarations"
 			fi
-		elif [ -z "$LM" ]; then
+		;;
+		*)
 			echo "Fastboot enabled, but no loader method was defined, what are you doing?"
-		fi
+		;;
+		esac
 	else
 		echo "There are no autostarted sessions!"
 	fi
diff --git a/ts/build/packages/libreoffice/build/install b/ts/build/packages/libreoffice/build/install
index 52e7e42749..c3fe0a3cc9 100755
--- a/ts/build/packages/libreoffice/build/install
+++ b/ts/build/packages/libreoffice/build/install
@@ -16,7 +16,7 @@ if [ -n "$1" ]; then
   else
     ls */DEBS/*.deb */DEBS/desktop-integration/*.deb 2>/dev/null | while read file
     do
-      if [ -n "`echo $file | grep -v dict-es | grep -v dict-fr | grep -v extension`" ]; then
+      if [ -n "`echo $file | grep -v dict-es | grep -v dict-fr`" ]; then
       ar -xf $file
       let returnval=returnval+$?
       tar -C ../$installdir -xf data.tar.*