diff --git a/builder/cross_win32.sh b/builder/cross_win32.sh
index 96d0671bc..bf37e03ac 100755
--- a/builder/cross_win32.sh
+++ b/builder/cross_win32.sh
@@ -18,17 +18,17 @@ download()
   if [ ! -e $URLPREFIX$PACK$URLSUFFIX ]
   then
     echo "Downloading $PACK... [$URL$URLPREFIX$PACK$URLSUFFIX]"
-    wget -q $URL$URLPREFIX$PACK$URLSUFFIX
+    wget -q $URL$URLPREFIX$PACK$URLSUFFIX || exit 2
   fi
 
   echo "Extracting $PACK..."
-  7z x $URLPREFIX$PACK$URLSUFFIX 1> /dev/null
+  7z -y -o$BASEDIR x $URLPREFIX$PACK$URLSUFFIX 1> /dev/null || exit 2
 
   RET=$?
 
-  if [ -d $PACK/bin ]
+  if [ -d $BASEDIR/$PACK/bin ]
   then
-    chmod +x $PACK/bin/*.exe
+    chmod +x $BASEDIR/$PACK/bin/*.exe
   fi
 
   return $RET
@@ -114,12 +114,12 @@ if [ ! -z $WINEVERSION ]
 then
   export BASEWINEDIR=$BASEDIR/wineversion
   export WINEDIR=$BASEWINEDIR/$WINEVERSION/bin
-    if [ ! -d $WINEDIR ]
+  if [ ! -d $WINEDIR ]
   then
     echo "Downloading WINE $WINEVERSION... [http://www.playonlinux.com/wine/binaries/linux-amd64/PlayOnLinux-wine-$WINEVERSION-linux-amd64.pol]"
     wget -q http://www.playonlinux.com/wine/binaries/linux-amd64/PlayOnLinux-wine-$WINEVERSION-linux-amd64.pol
-    echo "Extracting WINE $WINEVERSION..."
-    tar xjf PlayOnLinux-wine-$WINEVERSION-linux-amd64.pol
+    echo "Extracting WINE $WINEVERSION... ($BASEDIR)"
+    tar xjf PlayOnLinux-wine-$WINEVERSION-linux-amd64.pol --directory=/opt/wincross
   fi
 fi
 
@@ -175,7 +175,7 @@ export WINEPREFIX=$BASEDIR/wine/$WINEVERSION
 
 mkdir -p $WINEPREFIX
 
-# launch WINE fot the first time
+# launch WINE for the first time
 wine ping
 
 # Copy winemenubuilder.exe to wine to avoid missing X11 warnings