Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r1abc0349c736a70fb56db6895947abfbba0eee22 -r8d0569c37baa53ecc7073c03d5e03ca423656c70
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 1abc0349c736a70fb56db6895947abfbba0eee22)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 8d0569c37baa53ecc7073c03d5e03ca423656c70)
@@ -71,7 +71,7 @@
 static BOOL treatmentCompleted;                                 ///< Flag indicates whether the treatment has completed.
 
 static U32  presTreatmentTimeSecs;                              ///< Prescribed treatment time (in seconds).
-static F32  presUFVolumeMl;                                      ///< Prescribed ultrafiltration volume (in L).
+static F32  presUFVolumeMl;                                     ///< Prescribed ultrafiltration volume (in mL).
 static F32  presUFRateMlMin;                                    ///< Prescribed ultrafiltration rate (in mL/Min).
 
 static U32  treatmentTimeMS;                                    ///< Elapsed treatment time (in ms).
@@ -433,7 +433,8 @@
     }
 
     // If alarm fires while bolus is active, abort the bolus
-    if ( ( TRUE == doesAlarmStatusIndicateStop() ) && ( TRUE == isFluidBolusActive() ) )
+    if ( ( TRUE == doesAlarmStatusIndicateStop() ) && ( TRUE == isFluidBolusActive() ) &&
+         ( currentTreatmentState != TREATMENT_PAUSED_STATE ) )
     {
         signalAbortFluidBolus();
     }
@@ -919,7 +920,7 @@
         payload.rinsebackState = 0; // getCurrentRinsebackState();
         payload.txRecircState = 0; // getCurrentTreatmentRecircState();
         payload.txEndState = 0; // getCurrentTreatmentEndState();
-        payload.txSalBolusState = 0; //
+        payload.txFluidBolusState = getCurrentFluidBolusState();
         payload.txHepState = 0; //
         broadcastData( MSG_ID_TD_TREATMENT_STATE_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)(&payload), sizeof( TREATMENT_STATE_DATA_T ) );
     }