Index: firmware/App/Monitors/Pressures.c
===================================================================
diff -u -rf8531a3d3a626d68f6f4c5a01babadbdfa7dc1ab -rc1df3cdad1542bda2dae4cc4a848d04ad47a479d
--- firmware/App/Monitors/Pressures.c	(.../Pressures.c)	(revision f8531a3d3a626d68f6f4c5a01babadbdfa7dc1ab)
+++ firmware/App/Monitors/Pressures.c	(.../Pressures.c)	(revision c1df3cdad1542bda2dae4cc4a848d04ad47a479d)
@@ -484,10 +484,10 @@
     if ( PRESSURE_LIMITS_STATE_STABLE == currPresLimitsState )
     {
         // apply pressure windows when stable
-        S32 artOffset = getTreatmentParameterU32( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW ) / 2;
-        S32 venMinOffset = getTreatmentParameterU32( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC );
-        S32 venMaxOffset = getTreatmentParameterU32( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW ) - venMinOffset;
-        S32 tmpOffset =  getTreatmentParameterU32( TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW ) / 2;
+        S32 artOffset    = (S32)getTreatmentParameterU32( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW ) / 2;
+        S32 venMinOffset = (S32)getTreatmentParameterU32( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC );
+        S32 venMaxOffset = (S32)getTreatmentParameterU32( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW ) - venMinOffset;
+        S32 tmpOffset    = (S32)getTreatmentParameterU32( TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW ) / 2;
 
         currentArterialMinLimit = stableArterialPressure - artOffset;
         currentArterialMinLimit = MAX( currentArterialMinLimit, ARTERIAL_PRESSURE_LIMIT_MIN_MMHG );
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -rea02f813a3b84bfbb5f1d3b4adbba6152ba9316d -rc1df3cdad1542bda2dae4cc4a848d04ad47a479d
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision ea02f813a3b84bfbb5f1d3b4adbba6152ba9316d)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision c1df3cdad1542bda2dae4cc4a848d04ad47a479d)
@@ -182,8 +182,8 @@
     SW_FAULT_ID_VALVES_INVALID_VALVE_FINDING_EDGE = 151,
     SW_FAULT_ID_TD_VALVES_INVALID_FIND_DEENERGIZED_EDGE = 152,
     SW_FAULT_ID_BLOOD_PRIME_INVALID_STATE = 153,
-    SW_FAULT_ID_MODE_PRE_TREATMENT_INVALID_STATE = 148,
-    SW_FAULT_ID_INVALID_TREATMENT_MODALITY = 149,
+    SW_FAULT_ID_MODE_PRE_TREATMENT_INVALID_STATE = 154,
+    SW_FAULT_ID_INVALID_TREATMENT_MODALITY = 155,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
Index: firmware/App/Services/TxParams.c
===================================================================
diff -u -r7652af03a25dfbaa4af4a7aeb0a228a16dcf979f -rc1df3cdad1542bda2dae4cc4a848d04ad47a479d
--- firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision 7652af03a25dfbaa4af4a7aeb0a228a16dcf979f)
+++ firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision c1df3cdad1542bda2dae4cc4a848d04ad47a479d)
@@ -527,9 +527,7 @@
         reasons[ TREATMENT_PARAM_TREATMENT_MODALITY ] = REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE;
         result = FALSE;
     }
-
-    // TODO should execute the below for loop only if result is true, should I have this conditional check?
-    if ( TRUE == result )
+    else
     {
         // Range check treatment parameters excluding treatment modality and up to (but not including) UF volume
         for ( param = TREATMENT_PARAM_HDF_TREATMENT_MODE; param < TREATMENT_PARAM_UF_VOLUME; param++ )