diff --git a/loaih/__init__.py b/loaih/__init__.py
index 1fe8873..c25c045 100644
--- a/loaih/__init__.py
+++ b/loaih/__init__.py
@@ -205,14 +205,16 @@ class Build(object):
         # Let's process standard languages and append results to the
         # buildtarball
         if self.language == 'basic':
-            buildtarballs.extend([ x for x in self.tarballs[arch] if 'langpack_en-GB' in x])
             if self.offline_help:
-                buildtarballs.extend([ x for x in self.tarballs[arch] if 'helppack_en-GB' in x ])
-        if self.language == 'standard':
+                buildtarballs.extend([ x for x in self.tarballs[arch] if 'pack_en-GB' in x ])
+            else:
+                buildtarballs.extend([ x for x in self.tarballs[arch] if 'langpack_en-GB' in x])
+        elif self.language == 'standard':
             for lang in Build.LANGSTD:
-                buildtarballs.extend([ x for x in self.tarballs[arch] if ('langpack' + lang) in x ])
                 if self.offline_help:
-                    buildtarballs.extend([ x for x in self.tarballs[arch] if ('helppack' + lang) in x ])
+                    buildtarballs.extend([ x for x in self.tarballs[arch] if ('pack' + lang) in x ])
+                else:
+                    buildtarballs.extend([ x for x in self.tarballs[arch] if ('langpack' + lang) in x ])
         else:
             # In any other cases, we build with all languages
             if not self.offline_help:
@@ -284,7 +286,7 @@ class Build(object):
         # Cleanup phase, before new run.
         for deb in glob.glob(self.appnamedir + '/*.deb'):
             os.remove(deb)
-        subprocess.run("find . -type d -maxdepth 1 -exec rm -rf {} \+", shell=True)
+        subprocess.run("find . -mindepth 1 -maxdepth 1 -type d -exec rm -rf {} \+", shell=True)
 
     def checksums(self):
         """Create checksums of the built versions."""