Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -re5d6674fbf4b6ddd8057385babac0a085ce18f42 -re5fc9a1e8898da7bc6d26f1e333ee44f6544d214
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision e5d6674fbf4b6ddd8057385babac0a085ce18f42)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision e5fc9a1e8898da7bc6d26f1e333ee44f6544d214)
@@ -8,7 +8,7 @@
 * @file    ModeTreatment.c
 *
 * @author  (last)      Sean Nash
-* @date    (last)      07-Feb-2023
+* @date    (last)      15-Mar-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -1077,7 +1077,7 @@
         pendingParamChangesTimer = getMSTimerCount();
 
         // Verify UF rate change would be valid (leave zero if not valid - UI will disable option)
-        if ( uFRate <= (F32)MAX_UF_RATE_ML_MIN )
+        if ( ( uFRate <= (F32)MAX_UF_RATE_ML_MIN ) && ( uFRate >= MIN_UF_RATE_ML_MIN ) )
         {
             result = TRUE;
             pendingUFVolumeChange = uFVolume;
@@ -1405,7 +1405,7 @@
             data.treatmentTimeElapsedinSec = elapsedTreatmentTimeInSecs;
             data.treatmentTimeRemaininginSec = presTreatmentTimeSecs - elapsedTreatmentTimeInSecs;
         }
-        broadcastData( MSG_ID_TREATMENT_TIME, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( TREATMENT_TIME_DATA_T ) );
+        broadcastData( MSG_ID_TREATMENT_TIME_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( TREATMENT_TIME_DATA_T ) );
         treatmentTimeBroadcastTimerCtr = 0;
     }
     // Broadcast treatment state data at interval
@@ -1424,7 +1424,7 @@
         payload.heparinState = getHeparinState();
         payload.dialysisState = getDialysisState();
 
-        broadcastData( MSG_ID_TREATMENT_STATE, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&payload, sizeof( TREATMENT_STATE_DATA_T ) );
+        broadcastData( MSG_ID_TREATMENT_STATE_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&payload, sizeof( TREATMENT_STATE_DATA_T ) );
         treatmentStateBroadcastTimerCtr = 0;
     }
 }