diff --git a/script/app-mlperf-automotive-mlcommons-python/meta.yaml b/script/app-mlperf-automotive-mlcommons-python/meta.yaml
index 62971640e..7f22476e7 100644
--- a/script/app-mlperf-automotive-mlcommons-python/meta.yaml
+++ b/script/app-mlperf-automotive-mlcommons-python/meta.yaml
@@ -407,7 +407,7 @@ variations:
       - ml-engine-torchvision
     - tags: get,generic-python-lib,_package.torchinfo
     - tags: get,generic-python-lib,_package.torchmetrics
-    - tags: get,generic-sys-util,_libgl1-mesa-glx
+    - tags: get,generic-sys-util,_libgl1
     - tags: get,generic-python-lib,_package.onnx
     - tags: get,generic-python-lib,_package.onnxruntime
     - tags: get,generic-python-lib,_package.tqdm
@@ -469,7 +469,7 @@ variations:
       - ml-engine-torchvision
     - tags: get,generic-python-lib,_package.torchinfo
     - tags: get,generic-python-lib,_package.torchmetrics
-    - tags: get,generic-sys-util,_libgl1-mesa-glx
+    - tags: get,generic-sys-util,_libgl1
     - tags: get,generic-python-lib,_package.onnx
     - tags: get,generic-python-lib,_package.onnxruntime
     - tags: get,generic-python-lib,_package.tqdm
diff --git a/script/app-mlperf-automotive/meta.yaml b/script/app-mlperf-automotive/meta.yaml
index 6353fad4e..5fc1f0def 100644
--- a/script/app-mlperf-automotive/meta.yaml
+++ b/script/app-mlperf-automotive/meta.yaml
@@ -239,7 +239,7 @@ variations:
         enable_if_env:
           MLC_USE_DATASET_FROM_HOST:
           - 'yes'
-      - tags: get,ml-model,bevformer,_mlc,_rclone
+      - tags: get,ml-model,bevformer,_mlc,_r2-downloader
         enable_if_env:
           MLC_USE_MODEL_FROM_HOST:
           - 'yes'
@@ -275,7 +275,7 @@ variations:
         enable_if_env:
           MLC_USE_DATASET_FROM_HOST:
           - 'yes'
-      - tags: get,ml-model,deeplabv3-plus,_mlc,_rclone
+      - tags: get,ml-model,deeplabv3-plus,_mlc,_r2-downloader
         enable_if_env:
           MLC_USE_MODEL_FROM_HOST:
           - 'yes'
@@ -347,7 +347,7 @@ variations:
         enable_if_env:
           MLC_USE_DATASET_FROM_HOST:
           - 'yes'
-      - tags: get,ml-model,ssd,resnet50,_mlc,_rclone
+      - tags: get,ml-model,ssd,resnet50,_mlc,_r2-downloader
         enable_if_env:
           MLC_USE_MODEL_FROM_HOST:
           - 'yes'
diff --git a/script/get-preprocessed-dataset-cognata/meta.yaml b/script/get-preprocessed-dataset-cognata/meta.yaml
index 908d51e0c..01dada956 100644
--- a/script/get-preprocessed-dataset-cognata/meta.yaml
+++ b/script/get-preprocessed-dataset-cognata/meta.yaml
@@ -62,12 +62,12 @@ variations:
     add_deps_recursive:
       dae:
         tags: _r2-downloader
+    default: true
   rclone:
     group: download-tool
     add_deps_recursive:
       dae:
         tags: _rclone
-    default: true
   dry-run:
     group: run-mode
     env:
diff --git a/script/get-preprocessed-dataset-nuscenes/customize.py b/script/get-preprocessed-dataset-nuscenes/customize.py
index 635994ec0..abafdf689 100644
--- a/script/get-preprocessed-dataset-nuscenes/customize.py
+++ b/script/get-preprocessed-dataset-nuscenes/customize.py
@@ -41,4 +41,15 @@ def postprocess(i):
                             env['MLC_PREPROCESSED_DATASET_NUSCENES_PATH'].rstrip("/")),
                         env['MLC_DATASET_NUSCENES_SCENE_PICKLE_FILENAME']))
 
+    # Ensure scene_lengths.pkl is alongside the dataset directory regardless of how it was obtained
+    dataset_path = env.get('MLC_PREPROCESSED_DATASET_NUSCENES_PATH', '').rstrip('/')
+    pickle_filename = env.get('MLC_DATASET_NUSCENES_SCENE_PICKLE_FILENAME', 'scene_lengths.pkl')
+    if dataset_path:
+        expected = os.path.join(os.path.dirname(dataset_path), pickle_filename)
+        if not os.path.exists(expected):
+            # Look one level higher (e.g. when downloaded outside the preprocessed dir)
+            candidate = os.path.join(os.path.dirname(os.path.dirname(dataset_path)), pickle_filename)
+            if os.path.exists(candidate):
+                shutil.copy(candidate, expected)
+
     return {'return': 0}