diff --git a/notebooks/LPD/LPD_Correct_Fast.ipynb b/notebooks/LPD/LPD_Correct_Fast.ipynb
index 851c96681325bbfe64587c2d15097aac619bf077..d66171b0d5015ef6fe90ed13b6a1c80ab3117d64 100644
--- a/notebooks/LPD/LPD_Correct_Fast.ipynb
+++ b/notebooks/LPD/LPD_Correct_Fast.ipynb
@@ -314,19 +314,16 @@
     "# Validate the constants availability and raise/warn accordingly.\n",
     "missing_dark_modules = set()\n",
     "for mod, calibrations in const_data.items():\n",
-    "    missing_dark_constants = set(\n",
-    "        c for c in [\"Offset\", \"BadPixelsDark\"] if c not in calibrations.keys())\n",
-    "    missing_gain_constants = set(\n",
-    "        c for c in [\"BadPixelsFF\", \"GainAmpMap\", \"FFMap\", \"RelativeGain\"] if c not in calibrations.keys())  # noqa\n",
+    "    missing_dark_constants = {\"Offset\", \"BadPixelsDark\"} - set(calibrations)\n",
+    "    missing_gain_constants = {\n",
+    "        \"BadPixelsFF\", \"GainAmpMap\", \"FFMap\", \"RelativeGain\"}  - set(calibrations)\n",
     "    if missing_dark_constants:\n",
-    "        warning(\n",
-    "            f\"Dark constants {missing_dark_constants} are not available for correction for {mod}.\")  # noqa\n",
+    "        warning(f\"Dark constants {missing_dark_constants} are not available to correct {mod}.\")  # noqa\n",
     "        missing_dark_modules.update(mod)\n",
     "    if missing_gain_constants:\n",
-    "        warning(\n",
-    "            f\"Gain constants {missing_gain_constants} were not retrieved. Module: {mod}\")\n",
+    "        warning(f\"Gain constants {missing_gain_constants} were not retrieved for {mod}\")\n",
     "    if calibrations[\"BadPixelsDark\"].dtype != np.uint32:  # Old LPD constants are stored as float32.\n",
-    "        calibrations[\"BadPixelsDark\"] = calibrations[\"BadPixelsDark\"].astype(np.uint32)\n",
+    "        calibrations[\"BadPixelsDark\"] = calibrations[\"BadPixelsDark\"].astype(np.uint32, copy=False)\n",
     "if missing_dark_modules == set(karabo_da):\n",
     "    raise ValueError(f\"Dark constants are missing for all modules {karabo_da}\")\n",
     "total_time = perf_counter() - start\n",
diff --git a/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb b/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb
index 869d37ce76742ba7f119312c1ada67bf84629b4a..172432643e534913f0218f8732da351606765107 100644
--- a/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb
+++ b/notebooks/LPD/LPD_retrieve_constants_precorrection.ipynb
@@ -142,16 +142,14 @@
     "\n",
     "# Validate the constants availability and raise/warn correspondingly. \n",
     "for mod, ccv_dict in lpd_cal_metadata.items():\n",
-    "    missing_dark_constants = set(\n",
-    "        c for c in [\"Offset\", \"BadPixelsDark\"] if c not in ccv_dict.keys())\n",
-    "    missing_gain_constants = set(\n",
-    "        c for c in [\"BadPixelsFF\", \"GainAmpMap\", \"FFMap\", \"RelativeGain\"] if c not in ccv_dict.keys())  # noqa\n",
+    "    \n",
+    "    missing_dark_constants = {\"Offset\", \"BadPixelsDark\"} - set(ccv_dict)\n",
+    "    missing_gain_constants = {\n",
+    "        \"BadPixelsFF\", \"GainAmpMap\", \"FFMap\", \"RelativeGain\"} - set(ccv_dict)\n",
     "    if missing_dark_constants:\n",
-    "        warning(\n",
-    "            f\"Dark constants {missing_dark_constants} are not available for correction. Module: {mod}\")  # noqa\n",
+    "        warning(f\"Dark constants {missing_dark_constants} are not available to correct {mod}\")  # noqa\n",
     "    if missing_gain_constants:\n",
-    "        warning(\n",
-    "            f\"Gain constants {missing_gain_constants} were not retrieved. Module: {mod}\")\n",
+    "        warning(f\"Gain constants {missing_gain_constants} were not retrieved for {mod}\")\n",
     "\n",
     "for mod, ccv_dict in lpd_cal_metadata.items():\n",
     "    mdata_dict = {\"constants\": dict()}\n",
@@ -160,6 +158,7 @@
     "                \"path\": str(lpd_cal.caldb_root / ccv_metadata[\"path\"]),\n",
     "                \"dataset\": ccv_metadata[\"dataset\"],\n",
     "                \"creation-time\": ccv_metadata[\"begin_validity_at\"],\n",
+    "                \"ccv_id\": ccv_metadata[\"ccv_id\"],\n",
     "        }\n",
     "    mdata_dict[\"physical-name\"] = ccv_metadata[\"physical_name\"]\n",
     "    retrieved_constants[mod] = mdata_dict\n",