diff --git a/build.py b/build.py
index 5d37b80..f0925c8 100644
--- a/build.py
+++ b/build.py
@@ -74,7 +74,7 @@ class Build(object):
 
         # Unpacking the tarballs
         for archive in buildtarballs:
-            subprocess.run("tar xzf ../%s.tar.gz" % archive, shell=True)
+            subprocess.run("tar xzf ../%s" % archive, shell=True)
 
         # At this point, let's decompress the deb packages
         os.chdir(os.path.join(self.__builddir__, self.__appname__, self.__appname__ + '.AppImage'))
@@ -108,11 +108,12 @@ class Build(object):
 
         # Copying built image to final directory
         subprocess.run("find . -iname '*.AppImage' -exec cp {} %s \;" % outdir, shell = True)
+        os.chdir('/tmp')
 
         def __del__(self):
             """Destructor for the class."""
             # Cleanup
-            shutil.rmtree(self.__builddir__)
+            del self.__builddir__
 
 
 if __name__ == '__main__':