Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -r5aed859fcb5f3874fe5ca6dde0d2d99fe7d7c26e
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 5aed859fcb5f3874fe5ca6dde0d2d99fe7d7c26e)
@@ -285,7 +285,8 @@
     maxUFVolumeML = maxUFVol;
     setUFRate = uFRate;
 
-    if ( TREATMENT_DIALYSIS_STATE == getTreatmentState() )
+    // Make rate changes in real time if currently performing dialysis.
+    if ( ( TREATMENT_DIALYSIS_STATE == getTreatmentState() ) && ( getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) )
     {
 #ifndef RUN_PUMPS_OPEN_LOOP
         setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -r5aed859fcb5f3874fe5ca6dde0d2d99fe7d7c26e
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 5aed859fcb5f3874fe5ca6dde0d2d99fe7d7c26e)
@@ -756,7 +756,7 @@
     // Update FIFOs and sub-ranks per active alarms table - for alarm ranking purposes to determine "top" alarm
     for ( a = ALARM_ID_NO_ALARM; a < NUM_OF_ALARM_IDS; a++ )
     {
-        if ( TRUE == alarmIsActive[a] )
+        if ( TRUE == alarmIsActive[ a ] )
         {
             ALARM_PRIORITY_T almPriority = ALARM_TABLE[ a ].alarmPriority;
             U32 subRank = ALARM_TABLE[ a ].alarmSubRank;