Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -rfba3daf7d2ab628bf90da7504b38d0b03f9e0bd9 -r8ceb2ec143cf3c62e50f2187ad771cd63f046842
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision fba3daf7d2ab628bf90da7504b38d0b03f9e0bd9)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 8ceb2ec143cf3c62e50f2187ad771cd63f046842)
@@ -55,7 +55,7 @@
 static U32 dgSubMode;                                                       ///< Current state (sub-mode) of current DG operation mode.
 static BOOL dgStartCommandSent;                                             ///< Flag indicates command to start DG has been sent.
 static BOOL dgStarted;                                                      ///< Flag indicates whether we have commanded the DG to start or stop.
-static BOOL dgTrimmerHeaterOn = FALSE;                          ///< Flag indicates whether we have commanded the DG to start or stop the trimmer heater.
+static BOOL dgTrimmerHeaterOn;                                              ///< Flag indicates whether we have commanded the DG to start or stop the trimmer heater.
 
 // State machine states
 static U32 timeStartMS = 0; // TODO is this needed?
Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -rb99fd6c434ba1f927e46f3ab80fec1239d63f28f -r8ceb2ec143cf3c62e50f2187ad771cd63f046842
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision b99fd6c434ba1f927e46f3ab80fec1239d63f28f)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 8ceb2ec143cf3c62e50f2187ad771cd63f046842)
@@ -56,7 +56,7 @@
 // ********** private data **********
 
 static U16 batteryStatus = 0;                                               ///< Battery current status.
-static U32 batteryRelStateOfCharge_pct = 0;                                 ///< Battery pack relative state of charge.
+static OVERRIDE_U32_T batteryRelStateOfCharge_pct = { 0, 0, 0, 0 };         ///< Battery pack relative state of charge.
 static OVERRIDE_F32_T batteryRemCapacity_mAh = { 0.0, 0.0, 0.0, 0 };        ///< Battery pack remaining capacity (in mAh).
 static U16 batteryPackStatus = 0;                                           ///< Battery pack current status.
 static U32 lastBatteryMonitorTime = 0;                                      ///< Previous battery monitor time.
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rad4d98e7d69ee6320a7ab573c353cd6ff92a76fe -r8ceb2ec143cf3c62e50f2187ad771cd63f046842
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision ad4d98e7d69ee6320a7ab573c353cd6ff92a76fe)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 8ceb2ec143cf3c62e50f2187ad771cd63f046842)
@@ -513,9 +513,7 @@
         timeWaitToFillMS = timeDepleteMS - ( getFillTimeMS() + RESERVOIR_SETTLE_TIME_MS + RESERVOIR_CYCLE_EXTRA_MARGIN_TIME_MS );
 
         // If the wait time has elapsed, trigger a fill command
-        // TODO uncomment
-        //if ( timeWaitToFillMS <= 0 )
-        // TODO uncomment
+        if ( timeWaitToFillMS <= 0 )
         {
             cmdStartDGFill( FILL_RESERVOIR_TO_VOLUME_ML, targetFillFlowRateLPM );
         }