diff --git a/arduino/hev_prototype_v1/src/UILoop.cpp b/arduino/hev_prototype_v1/src/UILoop.cpp
index 03ca64b1b1062041956c91936a8847b5422ea201..b61abf4d8b95295e430396106b9d2b0971c3fcf5 100644
--- a/arduino/hev_prototype_v1/src/UILoop.cpp
+++ b/arduino/hev_prototype_v1/src/UILoop.cpp
@@ -150,7 +150,7 @@ void UILoop::reportReadbackValues()
         _readback_data.valve_exhale = vexhale;
         _readback_data.valve_purge = vpurge;
 
-        _readback_data.ventilation_mode = static_cast<uint8_t>(_breathing_loop->getVentilationMode());
+        _readback_data.ventilation_mode = _breathing_loop->getVentilationMode();
 
         _readback_data.valve_inhale_percent  = 0;
         _readback_data.valve_exhale_percent  = 0;
diff --git a/raspberry-dataserver/CommsCommon.py b/raspberry-dataserver/CommsCommon.py
index 8b774c7fe66c1c4de0ceaa516026986720145730..5fdd8962dadcec6107280eef98157369c44c3c0b 100644
--- a/raspberry-dataserver/CommsCommon.py
+++ b/raspberry-dataserver/CommsCommon.py
@@ -296,8 +296,8 @@ class DataFormat(PayloadFormat):
     ambient_temperature: int      = 0
     airway_pressure: float        = 0.0
     flow: float                   = 0.0
-    flow_calc       : float       = 0.0
-    volume          : float       = 0.0
+    flow_calc       : float = 0.0
+    volume          : float = 0.0
     target_pressure : float = 0.0 ##
     process_pressure: float = 0.0 
     valve_duty_cycle: float = 0.0 
@@ -331,6 +331,7 @@ class DataFormat(PayloadFormat):
         self.ambient_temperature,
         self.airway_pressure,
         self.flow,
+        self.flow_calc,
         self.volume,
         self.target_pressure ,
         self.process_pressure,