Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r3417933e6edf61a914c428e2fa944b3b349272a4 -rd66ded5492dd8a760b235b12cb6767f0427ba573
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 3417933e6edf61a914c428e2fa944b3b349272a4)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision d66ded5492dd8a760b235b12cb6767f0427ba573)
@@ -36,7 +36,7 @@
 #define CONCENTRATE_PUMP_REVERSE_DIR                        0x0                                                 ///< Concentrate pump reverse direction configuration.
 
 #define CONCENTRATE_PUMP_RAMP_SPEED_INCREMENT               10.0F                                               ///< Speed increase (mL/min) when controlling concentrate pump to target step speed.
-#define CONCENTRATE_PUMP_MIN_SPEED                          3.0F                                                ///< Minimum speed for concentrate pump in mL per min.
+#define CONCENTRATE_PUMP_MIN_SPEED                          0.0F                                                ///< Minimum speed for concentrate pump in mL per min.
 #define CONCENTRATE_PUMP_SPD_OUT_OF_RANGE_TOL_WHEN_ON_PCT   0.01F                                               ///< Concentrate pump speed out of range tolerance when on in percentage.
 #define CONCENTRATE_PUMP_CLEANING_SPD_OUT_OF_RANGE_TOL_PCT  0.05F                                               ///< Concentrate pump cleaning mode speed out of range tolerance when on in percentage.
 #define CONCENTRATE_PUMP_SPD_OUT_OF_RANGE_TOL_WHEN_SLOW_MLPM 1.0F                                               ///< Concentrate pump speed out of range tolerance when slow in mL/min.
@@ -576,8 +576,8 @@
         }
 
         /*
-         * If 3.0 <= speed <= 60 set it
-         * If speed < 3.0 set to 0
+         * If 0.0 <= speed <= 60 set it
+         * If speed < 0.0 set to 0
          * else speed > 60 set to 60
          */
         if ( ( CONCENTRATE_PUMP_MIN_SPEED <= targetSpeed_ml_min ) && ( targetSpeed_ml_min <= CONCENTRATE_PUMP_MAX_SPEED ) )
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r6dd41ba21a4a1f7b8dd62627306f71c5d055307d -rd66ded5492dd8a760b235b12cb6767f0427ba573
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 6dd41ba21a4a1f7b8dd62627306f71c5d055307d)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision d66ded5492dd8a760b235b12cb6767f0427ba573)
@@ -131,7 +131,7 @@
 static U32 dataPublicationTimerCounter;                                                                                            ///< Data publication timer counter.
 static U32 primaryTargetTempAdjCounter;                                                                                            ///< Primary target temperature adjustment counter.
 static BOOL isTargetTempAdjusted;                                                                                                  ///< Flag indicating that target temperature is adjusted
-static U32 adjustedPrimaryTargetTemp;                                                                                              ///< Adjusted primary target temperature
+static F32 adjustedPrimaryTargetTemp;                                                                                              ///< Adjusted primary target temperature
 static BOOL isDialyzerTempFeedbackEnabled;                                                                                         ///< Flag indicating enable/disable the dilayser temp ( D28) based feedback adjustment
 static const F32 WATER_SPECIFIC_HEAT_DIVIDED_BY_MINUTES = 4184.0F / (F32)SEC_PER_MIN;                                              ///< Water specific heat in J/KgC / 60.
 static OVERRIDE_U32_T heatersDataPublishInterval = { HEATERS_DATA_PUBLISH_INTERVAL, HEATERS_DATA_PUBLISH_INTERVAL, 0, 0 };         ///< Heaters data publish time interval.
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r3f65e4b1e11315bd6ca3a30a80fd4848a9081dda -rd66ded5492dd8a760b235b12cb6767f0427ba573
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 3f65e4b1e11315bd6ca3a30a80fd4848a9081dda)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision d66ded5492dd8a760b235b12cb6767f0427ba573)
@@ -227,7 +227,7 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            setHeaterTargetTemperature( D45_HEAT, getGenDialysateTargetTemperature() );
+            setHeaterTargetTemperature( D45_HEAT, getTDTargetDialysateTemperature() );
             startHeater( D45_HEAT );
 
             //Testing : Enable close loop once testing is complete
@@ -260,7 +260,7 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            setHeaterTargetTemperature( D45_HEAT, getGenDialysateTargetTemperature() );
+            setHeaterTargetTemperature( D45_HEAT, getTDTargetDialysateTemperature() );
             startHeater( D45_HEAT );
 
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );