Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r8759adf902288368a8b0aaea7a809cc88822a9ab -r8ed9c441c706ff7160f1a8b7b8ff1eab988fe826
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 8759adf902288368a8b0aaea7a809cc88822a9ab)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 8ed9c441c706ff7160f1a8b7b8ff1eab988fe826)
@@ -406,7 +406,7 @@
 {
     ddVersion = getDDVersion();
 
-    return ( SW_COMPATIBILITY_REV == ddVersion.compatibilityRev );
+    return ( SW_COMPATIBILITY_REV == ddVersion.compatibilityRev )? TRUE : FALSE;
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r8759adf902288368a8b0aaea7a809cc88822a9ab -r8ed9c441c706ff7160f1a8b7b8ff1eab988fe826
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8759adf902288368a8b0aaea7a809cc88822a9ab)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8ed9c441c706ff7160f1a8b7b8ff1eab988fe826)
@@ -24,8 +24,8 @@
 #include "ModeInitPOST.h"
 #include "ModePostTreat.h"
 #include "ModePreTreat.h"
-#include "ModeTreatment.h"
 #include "ModeStandby.h"
+#include "ModeTreatment.h"
 #include "OperationModes.h"
 #include "Switches.h"
 #include "SystemCommTD.h"
@@ -84,7 +84,7 @@
  *************************************************************************/
 U32 transitionToStandbyMode( void )
 {
-//    TD_OP_MODE_T previousOpMode = getPreviousOperationMode();     //TODO
+    TD_OP_MODE_T previousOpMode = getPreviousOperationMode();     //TODO
 
     // Re-initialize when transitioning to standby mode
     initStandbyMode();
@@ -104,11 +104,11 @@
     // Set valves to default positions
     set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
     set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-    if ( getValveState( H1_VALV ) == VALVE_STATE_IDLE )
+    if ( VALVE_STATE_IDLE == getValveState( H1_VALV ) )
     {
         setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
     }
-    if ( getValveState( H19_VALV ) == VALVE_STATE_IDLE )
+    if ( VALVE_STATE_IDLE == getValveState( H19_VALV ) )
     {
         setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT );
     }
@@ -283,8 +283,7 @@
                                       getTreatmentParameterF32( TREATMENT_PARAM_ACID_CONCENTRATE_CONV_FACTOR ),
                                       bicarbConvFactor,
                                       getTreatmentParameterU32( TREATMENT_PARAM_SODIUM ),
-                                      getTreatmentParameterU32( TREATMENT_PARAM_BICARBONATE ),
-                                      getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME ) );
+                                      getTreatmentParameterU32( TREATMENT_PARAM_BICARBONATE ) );
         // Start treatment workflow with pretreatment mode
         // Set fluid type
         setFluidType( modality );
Index: firmware/App/Services/DDInterface.c
===================================================================
diff -u -r8759adf902288368a8b0aaea7a809cc88822a9ab -r8ed9c441c706ff7160f1a8b7b8ff1eab988fe826
--- firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 8759adf902288368a8b0aaea7a809cc88822a9ab)
+++ firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 8ed9c441c706ff7160f1a8b7b8ff1eab988fe826)
@@ -110,7 +110,6 @@
     preGenDialysateCmdSet.bicarbConvFactor    = 0.0F;
     preGenDialysateCmdSet.sodium              = 0;
     preGenDialysateCmdSet.bicarbonate         = 0;
-    preGenDialysateCmdSet.ufVolume            = 0.0F;
 
     dialysateDeliveryCmdSet.start             = FALSE;
     dialysateDeliveryCmdSet.dialRate          = 0.0F;
@@ -358,7 +357,7 @@
  * @param bicarbonate Level of bicarbonate used in mEq/L.
  * @return none
  *************************************************************************/
-void cmdStartPreGenerateDialysate( F32 qd, F32 dialTemp, F32 acidConvFactor, F32 bicarbConvFactor, U32 sodium, U32 bicarbonate, F32 ufVol )
+void cmdStartPreGenerateDialysate( F32 qd, F32 dialTemp, F32 acidConvFactor, F32 bicarbConvFactor, U32 sodium, U32 bicarbonate )
 {
     preGenDialysateCmdSet.start            = TRUE;
     preGenDialysateCmdSet.dialRate         = qd;
@@ -367,7 +366,6 @@
     preGenDialysateCmdSet.bicarbConvFactor = bicarbConvFactor;
     preGenDialysateCmdSet.sodium           = sodium;
     preGenDialysateCmdSet.bicarbonate      = bicarbonate;
-    preGenDialysateCmdSet.ufVolume         = ufVol;
 
 #ifndef TEST_UI_ONLY
     sendMessage( MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA, COMM_BUFFER_OUT_CAN_TD_2_DD, (U08*)(&preGenDialysateCmdSet), sizeof( PRE_GEN_DIALYSATE_REQ_PAYLOAD_T ) );
Index: firmware/App/Services/DDInterface.h
===================================================================
diff -u -r8759adf902288368a8b0aaea7a809cc88822a9ab -r8ed9c441c706ff7160f1a8b7b8ff1eab988fe826
--- firmware/App/Services/DDInterface.h	(.../DDInterface.h)	(revision 8759adf902288368a8b0aaea7a809cc88822a9ab)
+++ firmware/App/Services/DDInterface.h	(.../DDInterface.h)	(revision 8ed9c441c706ff7160f1a8b7b8ff1eab988fe826)
@@ -57,7 +57,7 @@
 BOOL setDialysateData( MESSAGE_T *message );
 BOOL setDialysatePressure( MESSAGE_T *message );
 
-void cmdStartPreGenerateDialysate( F32 qd, F32 dialTemp, F32 acidConvFactor, F32 bicarbConvFactor, U32 sodium, U32 bicarbonate, F32 ufVol );
+void cmdStartPreGenerateDialysate( F32 qd, F32 dialTemp, F32 acidConvFactor, F32 bicarbConvFactor, U32 sodium, U32 bicarbonate );
 void cmdStartGenerateDialysate( F32 qd, F32 quf, F32 dialTemp, BOOL bypass, F32 acidConvFactor, F32 bicarbConvFactor, U32 sodium, U32 bicarbonate );
 void cmdChangeQd( F32 qd );
 void cmdChangeQuf( F32 quf );