diff --git a/master.py b/master.py
index b8a7460..08d3e38 100644
--- a/master.py
+++ b/master.py
@@ -46,7 +46,7 @@ def build(pkgbuild, repo):
     # build with devtools
     os.chdir(pathlib.Path(pkgbuild).parent)
     res = subprocess.run(
-        ["makechrootpkg", "-D", os.path.join(config["basedir"]["makepkg"]), "-l", process_name, "-r",
+        ["makechrootpkg", "-c", "-D", os.path.join(config["basedir"]["makepkg"]), "-l", process_name, "-r",
          os.path.join(config["basedir"]["chroot"]), "--", "--config",
          os.path.join(config["basedir"]["makepkg"]) + "makepkg-" + '-'.join(
              repo.split("-")[1:]) + ".conf"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
@@ -192,8 +192,7 @@ def import_keys(pkgbuild):
                 logging.debug("[GPG] %s",
                               subprocess.run(
                                   ["gpg", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", k],
-                                  stdout=subprocess.PIPE,
-                                  stderr=subprocess.STDOUT).stdout.decode(errors='ignore'))
+                                  stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode(errors='ignore'))
                 logging.info("[GPG] Imported key %s", k)
 
 
@@ -359,9 +358,10 @@ if __name__ == '__main__':
                     while not q.empty():
                         try:
                             q.get(False)
+                            q.task_done()
                         except Empty:
                             continue
-                        q.task_done()
+                    logging.info("Waiting for remaining queue items to finish...")
                     q.join()
 
                     logging.info("Cleared Queue, clearing upstream repos...")