Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -r5531ef9081711c5d57cceba2d51ff9bb24b7c254 -r32aa5b5fa1e847e9002c7bfa311a923bbadea3fa
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 5531ef9081711c5d57cceba2d51ff9bb24b7c254)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 32aa5b5fa1e847e9002c7bfa311a923bbadea3fa)
@@ -253,11 +253,12 @@
     DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_INITIAL_FILL;
 
     // TODO: testing drybicart fill in pre-gen
+#if 0
     if ( getTestConfigStatus( TEST_CONFIG_DD_DRY_BICART_TEST ) == TRUE )
     {
         setBicartFillRequested();
     }
-
+#endif
     //execWetSelfTest();
 
     return state;
Index: firmware/App/Services/TDInterface.c
===================================================================
diff -u -r9eae2f683887bededd2240f51ddfc667d8c1d566 -r32aa5b5fa1e847e9002c7bfa311a923bbadea3fa
--- firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 9eae2f683887bededd2240f51ddfc667d8c1d566)
+++ firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 32aa5b5fa1e847e9002c7bfa311a923bbadea3fa)
@@ -562,7 +562,7 @@
             setTDAcidAndBicarbType( startTxRequest.acidConvFactor, startTxRequest.bicarbConvFactor,
                                     startTxRequest.sodium, startTxRequest.bicarbonate );
             setTDDialyzerBypass( startTxRequest.bypassDialyzer );
-            tdSubstitutionFlowRate.data = startTxRequest.substitutionrate;
+            tdSubstitutionFlowRate.data = startTxRequest.substitutionRate;
             setSubstitutionPumpTargetRate( D92_PUMP,  getTDSubstitutionFlowRate() );
 
             // start dialysate generation
@@ -593,7 +593,7 @@
                 setTDAcidAndBicarbType( startTxRequest.acidConvFactor, startTxRequest.bicarbConvFactor,
                                         startTxRequest.sodium, startTxRequest.bicarbonate );
                 setTDDialyzerBypass( startTxRequest.bypassDialyzer );
-                tdSubstitutionFlowRate.data = startTxRequest.substitutionrate;
+                tdSubstitutionFlowRate.data = startTxRequest.substitutionRate;
                 setSubstitutionPumpTargetRate( D92_PUMP,  getTDSubstitutionFlowRate() );
 
                 // Signal to update treatement parameters