Index: firmware/App/DGCommon.h
===================================================================
diff -u -r1ab0252d1f10457a220a3168b8157c3e0e189d6f -re5ad74ca84ead6c613dfcca396388ae5f6b77442
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 1ab0252d1f10457a220a3168b8157c3e0e189d6f)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision e5ad74ca84ead6c613dfcca396388ae5f6b77442)
@@ -34,7 +34,7 @@
 // TODO: Removed debug build flags when release build is ready
 //    #define BOARD_WITH_NO_HARDWARE          1
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // re-purposes drain pump enable pin for task timing
-//    #define DISABLE_HEATERS_AND_TEMPS       1
+    #define DISABLE_HEATERS_AND_TEMPS       1
 //    #define DISABLE_ACCELS                  1
 //    #define SKIP_POST                       1
     #define SKIP_CAL_CHECK               1
@@ -56,7 +56,7 @@
 
     // Turn these flags on to disable dialysate mixing
     #define DISABLE_DIALYSATE_CHECK         1
-    #define DISABLE_MIXING                  1
+    //#define DISABLE_MIXING                  1
     #define USE_SMALL_FLOW_SENSOR_K_FACTOR  1
     //#define DISABLE_FLOW_CONTROL_TREATMENT  1
     #define DISABLE_TRIMMER_HEATER 1
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rab7dfc361e5ee347141842b317f1fc2f16e4e3f3 -re5ad74ca84ead6c613dfcca396388ae5f6b77442
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision ab7dfc361e5ee347141842b317f1fc2f16e4e3f3)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e5ad74ca84ead6c613dfcca396388ae5f6b77442)
@@ -43,7 +43,7 @@
 #define TARGET_RO_PRESSURE_PSI                          130                                         ///< Target pressure for RO pump.
 #define TARGET_RO_FLOW_RATE_L                           0.8                                         ///< Target flow rate for RO pump.
 
-#define DIALYSATE_FILL_TIME_OUT                         ( 5 * SEC_PER_MIN * MS_PER_SECOND )         ///< Time out period when reservoir is not filled with correct dialysate.
+#define DIALYSATE_FILL_TIME_OUT                         ( 8 * SEC_PER_MIN * MS_PER_SECOND )         ///< Time out period when reservoir is not filled with correct dialysate.
 #define EMPTY_BOTTLE_DETECT_PERSISTENT_PERIOD_MS        ( 5 * MS_PER_SECOND )                       ///< Persistent period for empty bottle detect.
 ///< Persistent time interval for concentrate pumps prime.
 #define CONCENTRATE_PUMP_PRIME_INTERVAL                 ( 3 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )
Index: firmware/App/Tasks/TaskPriority.c
===================================================================
diff -u -rbbd5ac2589c8093f681f2284367975ddd220b553 -re5ad74ca84ead6c613dfcca396388ae5f6b77442
--- firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision bbd5ac2589c8093f681f2284367975ddd220b553)
+++ firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision e5ad74ca84ead6c613dfcca396388ae5f6b77442)
@@ -71,10 +71,8 @@
     // Monitor load cells
     execLoadCell();
 
-#ifndef DISABLE_HEATERS_AND_TEMPS
     // Temperature sensors read
     execTemperatureSensors();
-#endif
 
     // Conductivity sensors read
     execConductivitySensors();