diff --git a/Util/BuildTools/Deploy.bat b/Util/BuildTools/Deploy.bat
index e73076477..507878c8f 100644
--- a/Util/BuildTools/Deploy.bat
+++ b/Util/BuildTools/Deploy.bat
@@ -75,11 +75,11 @@ rem -- Upload ------------------------------------------------------------------
 rem ==============================================================================
 
 set DEPLOY_URI=!S3_PREFIX!/%DEPLOY_NAME%
-REM %AWS_COPY% %LATEST_PACKAGE_PATH% %DEPLOY_URI%
+%AWS_COPY% %LATEST_PACKAGE_PATH% %DEPLOY_URI%
 echo Latest build uploaded to %DEPLOY_URI%
 
 if %REPLACE_LATEST%==true (
-  REM %AWS_COPY% %DEPLOY_URI% %LATEST_DEPLOY_URI%
+  %AWS_COPY% %DEPLOY_URI% %LATEST_DEPLOY_URI%
   echo Latest build uploaded to %LATEST_DEPLOY_URI%
 )
 
diff --git a/Util/BuildTools/Package.bat b/Util/BuildTools/Package.bat
index ca112c2ae..af7cf7429 100644
--- a/Util/BuildTools/Package.bat
+++ b/Util/BuildTools/Package.bat
@@ -20,20 +20,17 @@ set USAGE_STRING="Usage: %FILE_N% [-h|--help] [--no-packaging] [--no-zip] [--cle
 
 set DO_PACKAGE=true
 set DO_COPY_FILES=true
-
 set DO_TARBALL=true
 set DO_CLEAN=false
 
 set UE_VERSION=4.22
 set PACKAGES=Carla
 
+
 :arg-parse
 if not "%1"=="" (
     if "%1"=="--clean" (
         set DO_CLEAN=true
-        set DO_TARBALL=false
-        set DO_PACKAGE=false
-        set DO_COPY_FILES=false
     )
 
     if "%1"=="--no-zip" (
@@ -191,7 +188,6 @@ rem ============================================================================
 if %DO_CLEAN%==true (
     echo %FILE_N% Removing intermediate build.
     rmdir /S /Q "!BUILD_FOLDER!"
-    goto :eof
 )
 
 rem ==============================================================================
@@ -324,7 +320,6 @@ for %%i in (%PACKAGES%) do (
     if %DO_CLEAN%==true (
         echo %FILE_N% Removing intermediate build.
         rmdir /S /Q "!BUILD_FOLDER!"
-        goto :eof
     )
   )
 )
diff --git a/Util/BuildTools/Windows.mk b/Util/BuildTools/Windows.mk
index f8ded768c..aa2a5e0a1 100644
--- a/Util/BuildTools/Windows.mk
+++ b/Util/BuildTools/Windows.mk
@@ -26,7 +26,7 @@ launch-only:
 	@"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --launch
 
 package: PythonAPI
-	@"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --ue-version 4.22
+	@"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --ue-version 4.22 $(ARGS)
 
 docs:
 	@doxygen
diff --git a/Util/ContentVersions.txt b/Util/ContentVersions.txt
index ed31801db..1b128ac64 100644
--- a/Util/ContentVersions.txt
+++ b/Util/ContentVersions.txt
@@ -31,3 +31,4 @@
 0.9.6: 20190710_0097e66
 0.9.7: 20191221_c88604b
 0.9.8: 20200306_06b6cb1
+Latest: 20200309_068d4a7