diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
index 03e121dd0f..f9120388fe 100644
--- a/packaging/linux/buildpackage.sh
+++ b/packaging/linux/buildpackage.sh
@@ -15,7 +15,7 @@ rm -rf root
 
 # Game files
 mkdir -p root/usr/bin/
-if [ $4 -eq "x64" ]; then
+if [ $4 = "x64" ]; then
 	cp -T $BUILTDIR/gtklaunch root/usr/bin/openra
 else
 	cp -T $BUILTDIR/gtklaunch32 root/usr/bin/openra
diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh
index 2001ee054f..9f85e730b4 100755
--- a/packaging/linux/deb/buildpackage.sh
+++ b/packaging/linux/deb/buildpackage.sh
@@ -9,7 +9,7 @@ fi
 VERSION=$1
 rootdir=`readlink -f $2`
 PACKAGE_SIZE=`du --apparent-size -c $rootdir/usr | grep "total" | awk '{print $1}'`
-if [ $4 -eq "x64" ]
+if [ $4 = "x64" ]
 then
 	ARCH=amd64
 else
diff --git a/packaging/linux/pkgbuild/buildpackage.sh b/packaging/linux/pkgbuild/buildpackage.sh
index 26b22c58ab..5d790073b6 100755
--- a/packaging/linux/pkgbuild/buildpackage.sh
+++ b/packaging/linux/pkgbuild/buildpackage.sh
@@ -6,11 +6,12 @@ then
     exit $E_BADARGS
 fi
 
-if [ $4 -eq "x64" ]
+if [ $4 = "x64" ]
 then
 	ARCH=x86_64
 else
 	ARCH=i686
+fi
 
 # Replace any dashes in the version string with periods
 PKGVERSION=`echo $1 | sed "s/-/\\./g"`
diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh
index e51fa4be80..e0b2a8e665 100755
--- a/packaging/linux/rpm/buildpackage.sh
+++ b/packaging/linux/rpm/buildpackage.sh
@@ -6,7 +6,7 @@ then
     exit $E_BADARGS
 fi
 
-if [ $5 -eq "x64" ]
+if [ $5 = "x64" ]
 then
 	ARCH=x86_64
 else
diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh
index 397263ea66..fe90628c61 100755
--- a/packaging/osx/buildpackage.sh
+++ b/packaging/osx/buildpackage.sh
@@ -22,6 +22,7 @@ rm OpenRA.app/Contents/Resources/OpenRA.ico
 rm OpenRA.app/Contents/Resources/OpenRA.Editor.exe
 rm OpenRA.app/Contents/Resources/OpenRA.Launcher.exe
 rm OpenRA.app/Contents/Resources/gtklaunch
+rm OpenRA.app/Contents/Resources/gtklaunch32
 
 # Package app bundle into a zip and clean up
 zip OpenRA-$1 -r -9 OpenRA.app