diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py
index 3d13e304..8149cf66 100644
--- a/module_build_service/scheduler/handlers/modules.py
+++ b/module_build_service/scheduler/handlers/modules.py
@@ -282,8 +282,3 @@ def wait(config, session, msg):
         # other backends need this implemented (e.g. COPR)
         return [module_build_service.messaging.KojiRepoChange(
             'fake msg', builder.module_build_tag['name'])]
-
-    # We don't have copr implementation finished yet, Let's fake the repo change event,
-    # as if copr builds finished successfully
-    if config.system == "copr":
-        return [module_build_service.messaging.KojiRepoChange('fake msg', build.koji_tag)]
diff --git a/module_build_service/scheduler/handlers/repos.py b/module_build_service/scheduler/handlers/repos.py
index 8090423c..7a6f7d88 100644
--- a/module_build_service/scheduler/handlers/repos.py
+++ b/module_build_service/scheduler/handlers/repos.py
@@ -121,12 +121,6 @@ def done(config, session, msg):
         further_work += start_next_batch_build(
             config, module_build, session, builder)
 
-        # We don't have copr implementation finished yet, Let's fake the repo change event,
-        # as if copr builds finished successfully
-        if config.system == "copr":
-            further_work += [module_build_service.messaging.KojiRepoChange('fake msg', module_build.koji_tag)]
-            return further_work
-
     else:
         if has_failed_components:
             module_build.transition(config, state=models.BUILD_STATES['failed'],
diff --git a/module_build_service/utils.py b/module_build_service/utils.py
index c531fcc0..fe5d29b5 100644
--- a/module_build_service/utils.py
+++ b/module_build_service/utils.py
@@ -174,7 +174,10 @@ def continue_batch_build(config, module, session, builder, components=None):
         components_to_build.append(c)
 
     # Start build of components in this batch.
-    with concurrent.futures.ThreadPoolExecutor(max_workers=config.num_consecutive_builds) as executor:
+    max_workers = 1
+    if config.num_consecutive_builds > 0:
+        max_workers = config.num_consecutive_builds
+    with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
         futures = {executor.submit(start_build_component, builder, c): c for c in components_to_build}
         concurrent.futures.wait(futures)