diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py
index 804ff5a5..a93a7bc2 100644
--- a/src/aare/daq/daq.py
+++ b/src/aare/daq/daq.py
@@ -1193,7 +1193,7 @@ class AareDAQ:
             f"zoom: {zoom_value} "
             f"exp:{samcam.exposure} "
             f"gain:{samcam.gain} "
-            f"omega:{omega_value}"
+            f"omega:{omega_value:.2f}"
         )
 
     def save_screenshot(self, filename: str):
@@ -1226,7 +1226,7 @@ class AareDAQ:
             photo_path = photos_dir / f"{filename}.jpeg"
             cv2.imwrite(str(photo_path), bgr_image)
 
-        upload_name = clean_filename or f"{sample_id}_{datetime.now().strftime('%Y%m%d_%H%M%S')}"
+        upload_name = filename or f"{sample_id}_{datetime.now().strftime('%Y%m%d_%H%M%S')}"
         final_message = (message or "").strip() or self._default_screenshot_message(sample_id)
         self.__aare.upload_image(sample_id, upload_name, bgr_image, message=final_message)