diff --git a/client/text_ui.py b/client/text_ui.py
index 27251c392..3b5b9dc18 100644
--- a/client/text_ui.py
+++ b/client/text_ui.py
@@ -636,6 +636,13 @@ def installPackages(packages = [], atomsdata = [], deps = True, emptydeps = Fals
 
     ### Before even starting the fetch, make sure that the user accepts their licenses
     licenses = Equo.get_licenses_to_accept(runQueue)
+    # is there ACCEPT_LICENSE in ENV?
+    myaccept_license = os.getenv("ACCEPT_LICENSE")
+    if myaccept_license:
+        myaccept_license = myaccept_license.split()
+        for mylic in myaccept_license:
+            if mylic in licenses:
+                licenses.pop(mylic)
     if licenses:
         print_info(red(" @@ ")+blue("You need to accept the licenses below:"))
         keys = licenses.keys()
diff --git a/libraries/databaseTools.py b/libraries/databaseTools.py
index 98901e325..be10d7a78 100644
--- a/libraries/databaseTools.py
+++ b/libraries/databaseTools.py
@@ -672,7 +672,7 @@ class etpDatabase:
                 mypath = self.ServiceInterface.quickpkg(myatom,mydest)
             except:
                 # remove broken bin before raising
-                mypath = os.path.join(mydest,myatom+etpConst['packagesext'])
+                mypath = os.path.join(mydest,os.path.basename(myatom)+etpConst['packagesext'])
                 if os.path.isfile(mypath):
                     os.remove(mypath)
                 import traceback