Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rfeb0cd09c472099121146674f89fe88c1445c4d0 -r4c5ab126c8c33f9a5dcc58cef8933bbe0b1c25b4
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision feb0cd09c472099121146674f89fe88c1445c4d0)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 4c5ab126c8c33f9a5dcc58cef8933bbe0b1c25b4)
@@ -976,7 +976,7 @@
         payload.rotorCount = getBloodPumpRotorCount();
         if ( ( MODE_PRET == opMode ) || ( MODE_TREA == opMode ) || ( MODE_POST == opMode ) )
         {   // prescribed flow only available in treatment modes
-            payload.presFlow = getTreatmentParameterS32( TREATMENT_PARAM_BLOOD_FLOW );
+            payload.presFlow = getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW );
         }
         else
         {
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rfeb0cd09c472099121146674f89fe88c1445c4d0 -r4c5ab126c8c33f9a5dcc58cef8933bbe0b1c25b4
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision feb0cd09c472099121146674f89fe88c1445c4d0)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 4c5ab126c8c33f9a5dcc58cef8933bbe0b1c25b4)
@@ -1109,7 +1109,7 @@
         payload.rotorCount = getDialInPumpRotorCount();
         if ( ( MODE_PRET == opMode ) || ( MODE_TREA == opMode ) || ( MODE_POST == opMode ) )
         {   // prescribed flow only available in treatment modes
-            payload.presFlow = getTreatmentParameterS32( TREATMENT_PARAM_DIALYSATE_FLOW );
+            payload.presFlow = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW );
         }
         else
         {
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r3b4158ff08e5116996f07bb2a670630119e440fc -r4c5ab126c8c33f9a5dcc58cef8933bbe0b1c25b4
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 3b4158ff08e5116996f07bb2a670630119e440fc)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 4c5ab126c8c33f9a5dcc58cef8933bbe0b1c25b4)
@@ -511,21 +511,13 @@
     if ( calcTimeSince( selfTestPreviousPublishDataTime ) >= SELF_TEST_TIME_DATA_PUB_INTERVAL )
     {
         U32 const elapsedSelfTestTimeInSecs = calcTimeSince( selfTestStartTime ) / MS_PER_SECOND;
+        SELF_TEST_DRY_PAYLOAD_T data;
 
         selfTestPreviousPublishDataTime = getMSTimerCount();
 
-        if ( elapsedSelfTestTimeInSecs <= MAX_DRY_SELF_TEST_TIME )
-        {
-            SELF_TEST_DRY_PAYLOAD_T data;
-
-            data.timeout   = MAX_DRY_SELF_TEST_TIME;
-            data.countdown = ( MAX_DRY_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
-            broadcastData( MSG_ID_HD_DRY_SELF_TEST_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
-        }
-        else
-        {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT, currentDrySelfTestsState );
-        }
+        data.timeout   = MAX_DRY_SELF_TEST_TIME;
+        data.countdown = ( MAX_DRY_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
+        broadcastData( MSG_ID_HD_DRY_SELF_TEST_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
     }
 }