diff --git a/daq/src/aaredaq/aaredb.py b/daq/src/aaredaq/aaredb.py
index 0470f3e2..30de6735 100644
--- a/daq/src/aaredaq/aaredb.py
+++ b/daq/src/aaredaq/aaredb.py
@@ -183,9 +183,9 @@ class AareWrapper:
                 monochromator="Si111",
                 transmission=r.transmission,
                 focusingOptic="Kirkpatrick-Baez",
-                beamlineFluxAtSample_ph_s=d.flux_ph_s,
-                beamSizeWidth=d.geom.beam_size_mm * 100,
-                beamSizeHeight=d.geom.beam_size_mm * 100,
+                beamlineFluxAtSample_ph_s=d.bl.flux_ph_s,
+                beamSizeWidth=d.geom.beam_size_mm.x * 100,
+                beamSizeHeight=d.geom.beam_size_mm.y * 100,
                 cryojetTemperature_K=d.bl.cryojet_K,
                 rotation=rotation
             )
@@ -240,9 +240,9 @@ class AareWrapper:
                 monochromator="Si111",
                 transmission=r.transmission,
                 focusingOptic="Kirkpatrick-Baez",
-                beamlineFluxAtSample_ph_s=d.flux_ph_s,
-                beamSizeWidth=d.geom.beam_size_mm * 100,
-                beamSizeHeight=d.geom.beam_size_mm * 100,
+                beamlineFluxAtSample_ph_s=d.bl.flux_ph_s,
+                beamSizeWidth=d.geom.beam_size_mm.x * 100,
+                beamSizeHeight=d.geom.beam_size_mm.y * 100,
                 cryojetTemperature_K=d.bl.cryojet_K,
                 gridScan=gridscan
             )
diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py
index 2e9f62b3..79d348cb 100644
--- a/daq/src/aaredaq/daq.py
+++ b/daq/src/aaredaq/daq.py
@@ -322,7 +322,7 @@ class AareDAQ:
 
             self.__devs.aerotech.wait_scan_done(total_time + 60)
         self.__jfjoch.wait_till_done(60)
-        self.__aare.confirm_image_written(self.sample, request)
+        self.__aare.sample_collected(self.sample)
         self.__devs.aerotech.reset()
 
     def measure_rotation(self, request: RotationScanRequest):