diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
index 7ef8ce2bc61ea1f6a6563bee9ea8cfed4bb6919e..dd59d0d1e4bae2ca5a9ccfc03fc2fa18e394fc0a 100644
--- a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
+++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
@@ -677,12 +677,12 @@
     "        with h5py.File(agipd_cal.caldb_root / mdata[\"path\"], \"r\") as cf:  # noqa\n",
     "            const_data[cname] = np.copy(cf[f\"{dataset}/data\"])\n",
     "            variant[cname] = cf[dataset].attrs[\"variant\"] if cf[dataset].attrs.keys() else 0  # noqa\n",
-    "    agipd_corr.init_constants(const_data, mod, variant)\n",
-    "    return module, da\n",
+    "    agipd_corr.init_constants(const_data, module, variant)\n",
+    "\n",
     "\n",
     "step_timer.start()\n",
     "with multiprocessing.Pool(processes=len(modules)) as pool:\n",
-    "    const_out = pool.starmap(load_constants, zip(karabo_da, modules))\n",
+    "    pool.starmap(load_constants, zip(karabo_da, modules))\n",
     "step_timer.done_step(f'Constants were loaded in ')"
    ]
   },
diff --git a/src/cal_tools/calcat_interface.py b/src/cal_tools/calcat_interface.py
index f1cd30c320fc6f5a2adaf92b06bc8663d4856cc7..89bfccc6391e9816dcb76aa75bd79b6f0f186883 100644
--- a/src/cal_tools/calcat_interface.py
+++ b/src/cal_tools/calcat_interface.py
@@ -728,7 +728,7 @@ class CalibrationData:
             table = [["Modules"] + cal_group]
 
             # Loop over calibrations and modules to form the next rows.
-            for mod in list(self.mod_to_pdu):
+            for mod in metadata:
                 mod_consts = []
 
                 for cname in cal_group: