diff --git a/scripts/download-build-in-cs.js b/scripts/download-build-in-cs.js
index 01346b758a..f722781e4b 100755
--- a/scripts/download-build-in-cs.js
+++ b/scripts/download-build-in-cs.js
@@ -76,7 +76,7 @@ async function main() {
         hostEcm: program.host
     });
 
-    alfrescoJsApi.login(program.username, program.password);
+    await alfrescoJsApi.login(program.username, program.password);
 
     let zipDemoNode;
 
diff --git a/scripts/download-build-lib-in-cs.js b/scripts/download-build-lib-in-cs.js
index 0a6f4a45fa..a6b093ff49 100644
--- a/scripts/download-build-lib-in-cs.js
+++ b/scripts/download-build-lib-in-cs.js
@@ -12,13 +12,15 @@ var exec = require('child_process').exec;
 var alfrescoJsApi;
 
 unzipRetry = (url, outputFolder, pacakge, tentativeNumber) => {
-    console.log(`Unzip  ${pacakge}` + path.join(__dirname, `../${pacakge}.zip`));
+    console.log(`Unzip  ${pacakge} in ` + path.join(__dirname, `../${pacakge}.zip`));
     fs.createReadStream(path.join(__dirname, `../${pacakge}.zip`))
         .pipe(unzip.Extract({path: path.join(__dirname, `../${outputFolder}/@alfresco/`)}))
-        .on('error', () => {
+        .on('error', (error) => {
+            console.log('Error' + error)
             if (tentativeNumber <= 4) {
+                fs.unlinkSync(path.join(__dirname, `../${pacakge}.zip`));
                 setTimeout(() => {
-                    downloadZip(tentativeNumber, url, outputFolder, pacakge);
+                    downloadZip(url, outputFolder, pacakge, tentativeNumber);
                 }, 10000);
             }
         })
@@ -48,7 +50,9 @@ downloadZip = async (url, outputFolder, pacakge, tentativeNumber) => {
     return await http.get(`http://${url}`, (response) => {
         response.pipe(file);
         file.on('finish', async () => {
-            unzipRetry(url, outputFolder, pacakge, tentativeNumber);
+            file.close(() => {
+                unzipRetry(url, outputFolder, pacakge, tentativeNumber);
+            });
         });
     });
 }
@@ -64,6 +68,7 @@ getUrl = async (folder, pacakge) => {
         console.log('error:  ' + error);
     }
 
+
     return await alfrescoJsApi.content.getContentUrl(zipDemoNode.entry.id, true);
 }
 
@@ -88,7 +93,7 @@ async function main() {
         program.output = 'node_modules'
     }
 
-    alfrescoJsApi.login(program.username, program.password);
+    await alfrescoJsApi.login(program.username, program.password);
 
     let coreUrl = await getUrl(program.folder, 'core');
     downloadZip(coreUrl, program.output, 'core');