Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -rd3b7ae356aae29c99cb039713a2e120fdbce5a9c -racf165d4bdd93d15f77e12e4cef3af7d6fb322ca
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision d3b7ae356aae29c99cb039713a2e120fdbce5a9c)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision acf165d4bdd93d15f77e12e4cef3af7d6fb322ca)
@@ -43,10 +43,13 @@
 #define RINSEBACK_FLOW_RATE_ADJ_ML_MIN             25                       ///< Adjustment amount (in mL/min) to apply when user requests increase/decrease in flow rate.
 #define MIN_RINSEBACK_FLOW_RATE_ML_MIN             50                       ///< Minimum rinseback flow rate (in mL/min).
 #define MAX_RINSEBACK_FLOW_RATE_ML_MIN            150                       ///< Maximum rinseback flow rate (in mL/min).
+
+#ifndef DISABLE_PUMP_FLOW_CHECKS
 /// Maximum rinseback volume measured by independent means (as % of target).
 static const F32 MAX_RINSEBACK_SAFETY_VOLUME_ML = ( TARGET_RINSEBACK_VOLUME_ML * 1.2 );
 /// Minimum rinseback volume measured by independent means (as % of target).
 static const F32 MIN_RINSEBACK_SAFETY_VOLUME_ML = ( TARGET_RINSEBACK_VOLUME_ML * 0.8 );
+#endif
 
 /// Interval at which rinseback progress is to be published to UI.
 static const U32 RINSEBACK_DATA_PUBLISH_INTERVAL  = ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
@@ -306,6 +309,7 @@
         // From moment we start rinseback, we consider blood side of dialyzer no longer fully primed
         setBloodIsPrimed( FALSE );
         result = RINSEBACK_RUN_STATE;
+        sendTreatmentLogEventData( MID_TREATMENT_RINSE_BACK_EVENT, 0.0, 0.0 );
     }
     // Has user requested to return to treatment?
     else if ( TRUE == backToTreatmentRequested )
@@ -371,7 +375,7 @@
     // Check for empty saline bag
     if ( TRUE == isSalineBagEmpty() )
     {
-        activateAlarmNoData( ALARM_ID_EMPTY_SALINE_BAG );
+        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_EMPTY_SALINE_BAG, getMeasuredArterialPressure() );
         setupForRinsebackStopOrPause();
         result = RINSEBACK_PAUSED_STATE;
     }
@@ -694,7 +698,7 @@
 {
     BOOL result = FALSE;
 
-    if ( ( rinsebackRate_mL_min + RINSEBACK_FLOW_RATE_ADJ_ML_MIN ) >= MIN_RINSEBACK_FLOW_RATE_ML_MIN )
+    if ( ( rinsebackRate_mL_min - RINSEBACK_FLOW_RATE_ADJ_ML_MIN ) >= MIN_RINSEBACK_FLOW_RATE_ML_MIN )
     {
         if ( RINSEBACK_RUN_STATE == rinsebackState )
         {