Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rc2951f468ebc19160ee9af14cc9c35bc16121889 -r0bb0852cf1b7abcd56df89f3b0328efeec37b15c
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision c2951f468ebc19160ee9af14cc9c35bc16121889)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 0bb0852cf1b7abcd56df89f3b0328efeec37b15c)
@@ -310,7 +310,7 @@
  * @details \b Outputs: none
  * @return Current fluid type (saline or substitution fluid).
  *************************************************************************/
-U32 getFluidType( void )
+FLUID_TYPE_T getFluidType( void )
 {
     return fluidType;
 }
@@ -323,7 +323,7 @@
  * @details \b Outputs: none
  * @return Treatment modality selected by the user on the home screen.
  *************************************************************************/
-U32 getModality( void )
+TREATMENT_TYPE_T getModality( void )
 {
     return modality;
 }
Index: firmware/App/Modes/ModeStandby.h
===================================================================
diff -u -rc2951f468ebc19160ee9af14cc9c35bc16121889 -r0bb0852cf1b7abcd56df89f3b0328efeec37b15c
--- firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision c2951f468ebc19160ee9af14cc9c35bc16121889)
+++ firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 0bb0852cf1b7abcd56df89f3b0328efeec37b15c)
@@ -49,8 +49,8 @@
 void signalAlarmActionToStandbyMode( ALARM_ACTION_T action );   // Execute alarm action as appropriate for Standby mode
 
 void setFluidType( U32 modality );                              // Set a specific fluid type
-U32 getFluidType( void );                                       // Get a specific fluid type
-U32 getModality( void );                                        // Get a specific modality
+FLUID_TYPE_T getFluidType( void );                              // Get a specific fluid type
+TREATMENT_TYPE_T getModality( void );                           // Get a specific modality
 
 /**@}*/
 
Index: firmware/App/Services/StateServices/FluidBolus.c
===================================================================
diff -u -rc2951f468ebc19160ee9af14cc9c35bc16121889 -r0bb0852cf1b7abcd56df89f3b0328efeec37b15c
--- firmware/App/Services/StateServices/FluidBolus.c	(.../FluidBolus.c)	(revision c2951f468ebc19160ee9af14cc9c35bc16121889)
+++ firmware/App/Services/StateServices/FluidBolus.c	(.../FluidBolus.c)	(revision 0bb0852cf1b7abcd56df89f3b0328efeec37b15c)
@@ -20,9 +20,9 @@
 #include "DDInterface.h"
 #include "FluidBolus.h"
 #include "Messaging.h"
-#include "Pressures.h"
 #include "ModeStandby.h"
 #include "ModeTreatment.h"
+#include "Pressures.h"
 #include "StateTxBloodPrime.h"
 #include "StateTxDialysis.h"
 #include "StateTxPaused.h"
Index: firmware/App/Services/TxParams.c
===================================================================
diff -u -rc2951f468ebc19160ee9af14cc9c35bc16121889 -r0bb0852cf1b7abcd56df89f3b0328efeec37b15c
--- firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision c2951f468ebc19160ee9af14cc9c35bc16121889)
+++ firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision 0bb0852cf1b7abcd56df89f3b0328efeec37b15c)
@@ -110,7 +110,7 @@
 /// Treatment parameter properties including data type, range limits and default values.
 static const TREATMENT_PARAMS_PROPERTIES_T TREAT_PARAMS_PROPERTIES[ NUM_OF_TREATMENT_PARAMS ] =
 {   //         type                min           max         default
-    { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=3},    {.uInt=0}    }, // TREATMENT_PARAM_TREATMENT_MODALITY
+    { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=2},    {.uInt=0}    }, // TREATMENT_PARAM_TREATMENT_MODALITY
     { CRITICAL_DATA_TYPE_U32, {.uInt=0},    {.uInt=2},    {.uInt=0}    }, // TREATMENT_PARAM_HDF_DILUTION
     { CRITICAL_DATA_TYPE_U32, {.uInt=50},   {.uInt=500},  {.uInt=50}   }, // TREATMENT_PARAM_BLOOD_FLOW
     { CRITICAL_DATA_TYPE_U32, {.uInt=50},   {.uInt=600},  {.uInt=50}   }, // TREATMENT_PARAM_DIALYSATE_FLOW
@@ -731,13 +731,13 @@
  *************************************************************************/
 static BOOL checkTreatmentParamsDependencies( U32 *reasons )
 {
-    BOOL result   = TRUE;
-    U32  txDur    = stagedParams[ TREATMENT_PARAM_TREATMENT_DURATION ].uInt;
-    U32  hepST    = stagedParams[ TREATMENT_PARAM_HEPARIN_DELIVERY_DURATION ].uInt;
-    F32  hepDR    = stagedParams[ TREATMENT_PARAM_HEPARIN_DELIVERY_RATE ].sFlt;
-    F32  hepBV    = stagedParams[ TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ].sFlt;
-    F32  txVol    = hepBV + ( hepDR * ( hepST / (F32)SEC_PER_MIN ) ) + SYRINGE_PUMP_PRIME_VOLUME_ML + SYRINGE_PUMP_FILL_VOLUME_OFFSET_ML;
-    U32  modality = stagedParams[ TREATMENT_PARAM_TREATMENT_MODALITY ].uInt;
+    BOOL result = TRUE;
+    U32  txDur  = stagedParams[ TREATMENT_PARAM_TREATMENT_DURATION ].uInt;
+    U32  hepST  = stagedParams[ TREATMENT_PARAM_HEPARIN_DELIVERY_DURATION ].uInt;
+    F32  hepDR  = stagedParams[ TREATMENT_PARAM_HEPARIN_DELIVERY_RATE ].sFlt;
+    F32  hepBV  = stagedParams[ TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ].sFlt;
+    F32  txVol  = hepBV + ( hepDR * ( hepST / (F32)SEC_PER_MIN ) ) + SYRINGE_PUMP_PRIME_VOLUME_ML + SYRINGE_PUMP_FILL_VOLUME_OFFSET_ML;
+    TREATMENT_TYPE_T modality = (TREATMENT_TYPE_T)stagedParams[ TREATMENT_PARAM_TREATMENT_MODALITY ].uInt;
 
     // Variable to validate acid conversion factor consistency
     U32 acidType        = stagedParams[ TREATMENT_PARAM_ACID_CONCENTRATE ].uInt;