Index: dialin/common/msg_ids.py
===================================================================
diff -u -r5d46528dea60d95e18caada03ff8e328b52bbb38 -r6ae3e7c5add82d7694a8bc1892f88c95e0bbd08b
--- dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 5d46528dea60d95e18caada03ff8e328b52bbb38)
+++ dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 6ae3e7c5add82d7694a8bc1892f88c95e0bbd08b)
@@ -208,7 +208,7 @@
     MSG_ID_HD_REQUEST_DG_SERVICE_RECORD = 0xB9
     MSG_ID_HD_REQUEST_UI_CONFIRMATION = 0xBA
     MSG_ID_UI_CONFIRMATION_RESULT = 0xBB
-    MSG_ID_DG_SET_RO_ONLY_MODE = 0xBC
+    MSG_ID_UI_SET_DG_RO_MODE = 0xBC
     MSG_ID_DG_CPLD_STATUS = 0xBD
     MSG_ID_HD_BATTERY_MANAGEMENT_DATA = 0xBE
     MSG_ID_HD_BATTERY_STATUS_DATA = 0xBF
Index: dialin/dg/dialysate_fill.py
===================================================================
diff -u -r5d46528dea60d95e18caada03ff8e328b52bbb38 -r6ae3e7c5add82d7694a8bc1892f88c95e0bbd08b
--- dialin/dg/dialysate_fill.py	(.../dialysate_fill.py)	(revision 5d46528dea60d95e18caada03ff8e328b52bbb38)
+++ dialin/dg/dialysate_fill.py	(.../dialysate_fill.py)	(revision 6ae3e7c5add82d7694a8bc1892f88c95e0bbd08b)
@@ -99,9 +99,9 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
         self.total_volume = struct.unpack('<f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
-        self.dg_fill_mode_timestamp = timestamp
         self.ro_only_mode_status = struct.unpack('<i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
+        self.dg_fill_mode_timestamp = timestamp
 
     def cmd_used_acid_volume_override(self, volume: float) -> int:
         """
Index: dialin/hd/ui_proxy.py
===================================================================
diff -u -r5d46528dea60d95e18caada03ff8e328b52bbb38 -r6ae3e7c5add82d7694a8bc1892f88c95e0bbd08b
--- dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision 5d46528dea60d95e18caada03ff8e328b52bbb38)
+++ dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision 6ae3e7c5add82d7694a8bc1892f88c95e0bbd08b)
@@ -1734,7 +1734,7 @@
         payload = st
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=MsgIds.MSG_ID_DG_SET_RO_ONLY_MODE.value,
+                                              message_id=MsgIds.MSG_ID_UI_SET_DG_RO_MODE.value,
                                               payload=payload)
 
         self.logger.debug("Setting RO only mode to: {}".format(status))
Index: dialin/hd/usage_info_record.py
===================================================================
diff -u -r82229ace97aa9278d0add3874dfc43dde9b028cc -r6ae3e7c5add82d7694a8bc1892f88c95e0bbd08b
--- dialin/hd/usage_info_record.py	(.../usage_info_record.py)	(revision 82229ace97aa9278d0add3874dfc43dde9b028cc)
+++ dialin/hd/usage_info_record.py	(.../usage_info_record.py)	(revision 6ae3e7c5add82d7694a8bc1892f88c95e0bbd08b)
@@ -58,7 +58,7 @@
         self._raw_usage_info_record = []
         self._utilities = NVOpsUtils(logger=self.logger)
         self.hd_usage_info_record = self._prepare_hd_usage_info_record()
-        self.hd_usage_info_record_timestamp = 0.0
+        self.hd_usage_info_record_timestamp = 0.0  # For timestamp
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_to_dialin_ch_id