diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
index a6a826ddb98d2fc8b5a17fb58cd88d987d7089c7..bc519599ef9faf5bae09aa94bd87cd14eafb6469 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
@@ -443,7 +443,7 @@
     "    if np.any(unique_cell_ids > mem_cells):\n",
     "        raise ValueError(\n",
     "            f\"Invalid cells found {unique_cell_ids} \"\n",
-    "            f\"for run: {run_dc.run_metadata()['runNumber']}.\")\n",
+    "            f\"for run: {run}.\")\n",
     "\n",
     "    context.map(process_cell, unique_cell_ids)\n",
     "\n",
diff --git a/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb b/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
index 885d30e9f0030d1fbc72759e51f755faa22c747e..07f3ee0d68a4acc37dcf4ef5dafbc7ce4cdc7905 100644
--- a/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
+++ b/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
@@ -133,8 +133,8 @@
    "outputs": [],
    "source": [
     "run_dc = RunDirectory(in_folder / f\"r{run_nums[0]:04d}\")\n",
-    "file_loc = raw_data_location_string(\n",
-    "    f\"p{run_dc.run_metadata()['proposalNumber']}\", run_nums)\n",
+    "proposal = list(filter(None, str(in_folder).strip('/').split('/')))[-2]\n",
+    "file_loc = raw_data_location_string(proposal, run_nums)\n",
     "receiver_names = [f\"*{receiver_template.format(x)}*\" for x in receiver_affixes]\n",
     "data_sources = sorted(list(run_dc.select(receiver_names).all_sources))"
    ]
diff --git a/notebooks/Timepix/Compute_Timepix_Event_Centroids.ipynb b/notebooks/Timepix/Compute_Timepix_Event_Centroids.ipynb
index 036bb35f7d417d5afa27d3fc66f80c3c55dabc7a..ac689b362deab4c481bda112416e4e0c820e744a 100755
--- a/notebooks/Timepix/Compute_Timepix_Event_Centroids.ipynb
+++ b/notebooks/Timepix/Compute_Timepix_Event_Centroids.ipynb
@@ -316,8 +316,8 @@
    "outputs": [],
    "source": [
     "dc = RunDirectory(Path(in_folder) / f'r{run:04d}', inc_suspect_trains=True)\n",
-    "\n",
-    "base_path=find_proposal(\"p%06i\" % int(dc.run_metadata()['proposalNumber']))\n",
+    "proposal = list(filter(None, in_folder.strip('/').split('/')))[-2]\n",
+    "base_path=find_proposal(proposal)\n",
     "\n",
     "if raw_timewalk_lut_filepath:\n",
     "    raw_timewalk_lut_filepath_full = (Path(base_path) / Path(raw_timewalk_lut_filepath)).resolve()\n",