diff --git a/openpilot/starpilot/flm/learning_wire.py b/openpilot/starpilot/flm/learning_wire.py
index 6c7da711e2..7cbbf16199 100644
--- a/openpilot/starpilot/flm/learning_wire.py
+++ b/openpilot/starpilot/flm/learning_wire.py
@@ -200,8 +200,9 @@ def write_control(parent, evidence):
   wire = parent.init('learningEvidence')
   for name, value in payload.items():
     if name in ('replaySnapshot', 'replayInputs', 'stageValues'):
-      rows = wire.init(name, len(value))
-      for row, fields in zip(rows, value, strict=True):
+      nested_values = cast(list[dict[str, object]], value)
+      rows = wire.init(name, len(nested_values))
+      for row, fields in zip(rows, nested_values, strict=True):
         for field, item in fields.items():
           setattr(row, field, item)
     else:
diff --git a/openpilot/starpilot/flm/tests/test_paired_drain_daemon.py b/openpilot/starpilot/flm/tests/test_paired_drain_daemon.py
index baf959f3e8..d2dda1901b 100644
--- a/openpilot/starpilot/flm/tests/test_paired_drain_daemon.py
+++ b/openpilot/starpilot/flm/tests/test_paired_drain_daemon.py
@@ -36,14 +36,14 @@ def test_actual_merged_daemon_callbacks_keep_fresh_tail_and_current_native_check
       return value
 
   class Collector(FullrateCollector):
-    def control(self, value, stamp):
-      accepted = super().control(value, stamp)
-      calls.append(('control', value.control_ns, self._learning_current_native_allowed, accepted, stamp))
+    def control(self, value, now_ns):
+      accepted = super().control(value, now_ns)
+      calls.append(('control', value.control_ns, self._learning_current_native_allowed, accepted, now_ns))
       return accepted
 
-    def output(self, value, stamp):
-      accepted = super().output(value, stamp)
-      calls.append(('output', value.apply_ns, self._learning_current_native_allowed, accepted, stamp))
+    def output(self, value, now_ns):
+      accepted = super().output(value, now_ns)
+      calls.append(('output', value.apply_ns, self._learning_current_native_allowed, accepted, now_ns))
       return accepted
 
   def factory(adapter):
diff --git a/openpilot/starpilot/flm/tests/test_tracking_publication_cadence.py b/openpilot/starpilot/flm/tests/test_tracking_publication_cadence.py
index 5b36fad5a4..6afae5745e 100644
--- a/openpilot/starpilot/flm/tests/test_tracking_publication_cadence.py
+++ b/openpilot/starpilot/flm/tests/test_tracking_publication_cadence.py
@@ -70,7 +70,7 @@ def delivery_run(monkeypatch, producer, phase, *, stop=False, withdraw=False):
     value = source(stamp)
     return replace(value, enabled=False) if withdraw and stamp >= BASE+1_500_000_000 else value
   monkeypatch.setattr(producer, 'tracking_message', writer)
-  monkeypatch.setattr(producer, 'drain', lambda *args: None)
+  monkeypatch.setattr(producer, 'drain_pair', lambda *args: None)
   started = time.monotonic_ns()
   with pytest.raises(LoopComplete):
     producer.run(SimpleNamespace(), SM(), object(), object(), SimpleNamespace(send=send), None, None,
diff --git a/prebuilt.json b/prebuilt.json
index a7fc3c1469..ded3e010cc 100644
--- a/prebuilt.json
+++ b/prebuilt.json
@@ -1 +1 @@
-{"protected_inventory_sha256": "413c4f4787d8748aa1c0410e5c7be8b1b2159f604f02772e3b34408cdb66b6a7", "schema_version": 1}
+{"protected_inventory_sha256": "bac00362c2a71e8b613fc38a6654dca4dfdf46b270f57f267da490c04e7cebf0", "schema_version": 1}