Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r16b02389432724c1bd15e9ce58579bff95050a03 -r263c7066dfbab2d872a37793706bd9ef0d90fc0c
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 16b02389432724c1bd15e9ce58579bff95050a03)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 263c7066dfbab2d872a37793706bd9ef0d90fc0c)
@@ -860,9 +860,9 @@
     {
         salineBolusStartRequested = FALSE;
         // Cmd all pumps to stop
-        setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-        setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-        setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+        setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
         stopSyringePump();
         // Begin saline bolus
         result = SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP;
@@ -965,6 +965,8 @@
         // Hard stop blood and dialysate pumps
         signalBloodPumpHardStop();
         signalDialInPumpHardStop();
+        // Tell DG to stop heating dialysate
+        cmdStopDGTrimmerHeater();
         // Send last saline bolus data
         salineBolusBroadcastTimerCtr = SALINE_BOLUS_DATA_PUB_INTERVAL;
         publishSalineBolusData();