diff --git a/autobuild.xml b/autobuild.xml
index 4b5c813367..91a22008a1 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2119,10 +2119,9 @@
                 <key>options</key>
                 <array>
                   <string>--build</string>
-		  <string>--package</string>
-		  <string>--platform darwin</string>
-		  <string>--fmod</string>
-		  <string>--kdu</string>
+                  <string>--platform darwin</string>
+                  <string>--fmod</string>
+                  <string>--kdu</string>
                 </array>
               </map>
               <key>configure</key>
@@ -2359,7 +2358,6 @@
                 <array>
                   <string>--build</string>
                   <string>--platform linux32</string>
-                  <string>--package</string>
                 </array>
               </map>
               <key>configure</key>
@@ -2715,7 +2713,6 @@
                 <array>
                   <string>--fmod</string>
                   <string>--kdu</string>
-                  <string>--package</string>
                   <string>--version</string>
                   <string>--platform win32</string>
                 </array>
diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh
index 6a7aee5576..3e1b06a367 100755
--- a/scripts/configure_firestorm.sh
+++ b/scripts/configure_firestorm.sh
@@ -79,7 +79,10 @@ getArgs()
               config)   WANTS_CONFIG=$TRUE;;
               version)  WANTS_VERSION=$TRUE;;
               chan)     CHANNEL="$OPTARG";;
-              btype)    BTYPE="$OPTARG";;
+              btype)    if [ \( "$OPTARG" == "Release" \) -o \( "$OPTARG" == "RelWithDebInfo" \) -o \( "$OPTARG" == "Debug" \) ] ; then
+	      			BTYPE="$OPTARG"
+			fi
+	      		;;
               kdu)      WANTS_KDU=$TRUE;;
 	      fmod)	WANTS_FMOD=$TRUE;;
 	      package)	WANTS_PACKAGE=$TRUE;;
@@ -91,6 +94,7 @@ getArgs()
               -*)       showUsage && exit 1;;
               *)        showUsage && exit 1;;            
               esac
+	      
           done
           shift $[OPTIND-1]
           if [ $OPTIND -le 1 ] ; then