Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -ra3916397312e1dc73efe99d6b3569b7387a9419b -r5719569ba64d430be7d554d69a865e08a15a5d4c
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision a3916397312e1dc73efe99d6b3569b7387a9419b)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 5719569ba64d430be7d554d69a865e08a15a5d4c)
@@ -50,7 +50,7 @@
 
 #define DRAIN_PUMP_DATA_PUB_INTERVAL           ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )                       ///< Interval (ms/task time) at which the Drain Pump data is published on the CAN bus.
 
-#define DRP_CONTROL_INTERVAL                   ( 200 / TASK_GENERAL_INTERVAL )                                  ///< Interval (ms/task time) at which the Drain pump is controlled.
+#define DRP_CONTROL_INTERVAL                   ( 1000 / TASK_GENERAL_INTERVAL )                                 ///< Interval (ms/task time) at which the Drain pump is controlled.
 #define DRP_CONTROL_MAX_ALLOWED_PPO_PSI        30.0F                                                            ///< Drain pump maximum allowed PPo pressure in psi.
 #define DRP_CONTROL_MAX_ALLOWED_PDR_PSI        40.0F                                                            ///< Drain pump maximum allowed PDr pressure in psi.
 #define DRP_CONTROL_PSI_TO_DAC_P_ONLY_TERM     0.2F                                                             ///< Drain pump psi to DAC conversion.
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r85339f0aa398217143fa3178a05ad5d6c6374bb8 -r5719569ba64d430be7d554d69a865e08a15a5d4c
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 85339f0aa398217143fa3178a05ad5d6c6374bb8)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 5719569ba64d430be7d554d69a865e08a15a5d4c)
@@ -69,7 +69,7 @@
 #define TRIMMER_HEATER_MAX_POWER_W                                 66.5F                                                           ///< Trimmer heater maximum power in Watts.
 #define TRIMMER_HEATER_INITIAL_CONTROL_INTERVAL_COUNT              ( ( 10 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )              ///< Trimmer heater initial control interval count.
 #define TRIMMER_HEATER_CONTROL_INTERVAL_COUNT                      ( ( 30 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )              ///< Trimmer heater control interval count.
-#define TRIMMER_HEATER_MIN_DIALYSATE_FLOWRATE_LPM                  0.05F                                                           ///< Trimmer heater minimum dialysate flow rate in L/min.
+#define TRIMMER_HEATER_MIN_DIALYSATE_FLOWRATE_LPM                  0.00F                                                           ///< Trimmer heater minimum dialysate flow rate in L/min.
 
 #define DELTA_TEMPERATURE_TIME_COSNTANT_C                          8.6F                                                            ///< Delta temperature calculated from time constant.
 #define PRIMARY_HEATER_DUTY_CYCLE_PER_TEMPERATURE_C                0.015F                                                          ///< Primary heaters duty cycle per temperature in C.