Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r670fd0c4637436f4bf934677b878f557e776022d -r223b7a2ff87e3559679b52e52236a7cb7195c985
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 670fd0c4637436f4bf934677b878f557e776022d)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 223b7a2ff87e3559679b52e52236a7cb7195c985)
@@ -1497,8 +1497,8 @@
     {
         enqueueEmbModeCmd( command );
 
-        bloodLeakEmbModeSetPoint  = setPointPayload;
-        result                    = TRUE;
+        bloodLeakEmbModeSetPoint = setPointPayload;
+        result                   = TRUE;
     }
 
     return result;
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r173e4fbf9bd750bccb2e758eb1c7ef36ed8db5a0 -r223b7a2ff87e3559679b52e52236a7cb7195c985
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 173e4fbf9bd750bccb2e758eb1c7ef36ed8db5a0)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 223b7a2ff87e3559679b52e52236a7cb7195c985)
@@ -36,7 +36,7 @@
 //    #define USING_DEBUGGER                  1           // Want to be able to use the debugger and have break points
 //    #define BOARD_WITH_NO_HARDWARE          1           // Target is a PCB w/ no hardware
 //    #define RUN_WITHOUT_DG                  1           // Run HD w/o DG
-    #define SIMULATE_UI                     1           // Build w/o requirement that UI be there
+//    #define SIMULATE_UI                     1           // Build w/o requirement that UI be there
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
       #define DISABLE_BATT_COMM               1           // Disable battery communication  // TODO soft switch
 //    #define READ_FPGA_ASYNC_DATA            1           // Test build reads non-priority register page every other time
Index: firmware/App/Modes/BloodPrime.c
===================================================================
diff -u -r8b73263b38f449dacc0795c67a7cf6240cb79026 -r223b7a2ff87e3559679b52e52236a7cb7195c985
--- firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision 8b73263b38f449dacc0795c67a7cf6240cb79026)
+++ firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision 223b7a2ff87e3559679b52e52236a7cb7195c985)
@@ -237,7 +237,7 @@
         setBloodIsPrimed( TRUE );       // Signal treatment mode that blood prime is completed
         signalDialInPumpHardStop();     // Stop dialysate recirculation - dialysis sub-mode will restart dialysate pumps
         signalBloodPrimeToDialysis();   // Signal treatment mode that it's time to start dialysis
-        cmdStopDGTrimmerHeater();       // Stop trimmer heater - dialysis sub-mode will restart as appropriate
+        //cmdStopDGTrimmerHeater();       // Stop trimmer heater - dialysis sub-mode will restart as appropriate
     }
     // Is blood prime taking too long based on set BP rate?
     else if ( fabs( expectedBloodPrimeVolume_mL - getBloodPrimeVolume() ) > MAX_BLOOD_PRIME_VOLUME_ERROR_ML )