diff --git a/easybuild/easyblocks/generic/bundle.py b/easybuild/easyblocks/generic/bundle.py
index 021f1e9c250..0af115e9d44 100644
--- a/easybuild/easyblocks/generic/bundle.py
+++ b/easybuild/easyblocks/generic/bundle.py
@@ -269,8 +269,8 @@ def check_checksums(self):
         """
         checksum_issues = super().check_checksums()
 
-        for comp, _ in self.comp_instances:
-            checksum_issues.extend(self.check_checksums_for(comp, sub="of component %s" % comp['name']))
+        for comp_cfg, _ in self.comp_instances:
+            checksum_issues.extend(self.check_checksums_for(comp_cfg, sub="of component %s" % comp_cfg['name']))
 
         return checksum_issues
 
@@ -279,7 +279,7 @@ def prepare_step(self, *args, **kwargs):
         Pre-configure step.
         At this point, dependencies are known. So transfer them to all components.
         """
-        super().prepare_step(self, *args, **kwargs)
+        super().prepare_step(*args, **kwargs)
         for _, comp in self.comp_instances:
             comp.toolchain.dependencies = self.toolchain.dependencies