Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r69f74d389c57686e5ad618ac57ccbdbfa6934805 -rf326ce71744dca862c186bc00795e84562e80936
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 69f74d389c57686e5ad618ac57ccbdbfa6934805)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision f326ce71744dca862c186bc00795e84562e80936)
@@ -345,9 +345,9 @@
 void stopDialysis( void )
 {
     // Stop pumps
-    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 );
+    signalDialInPumpHardStop();
+    signalDialOutPumpHardStop();
+    signalBloodPumpHardStop();
     stopSyringePump();
     // Tell DG to stop heating dialysate
     cmdStopDGTrimmerHeater();
@@ -1274,10 +1274,15 @@
     lcLastSteadyWeight[cycle][lcPrimaryIndex] = loadCellPrimaryWeight;
     lcLastSteadyWeight[cycle][lcBackupIndex]  = loadCellBackupWeight;
 
-    // Check for drift out of range
-    if ( driftDiff > LOAD_CELL_PRIMARY_BACKUP_MAX_ALLOWED_DRIFT_GRAMS )
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE, loadCellCurrentDrift, loadCellPreviousDrift )
+        // Check for drift out of range
+        if ( driftDiff > LOAD_CELL_PRIMARY_BACKUP_MAX_ALLOWED_DRIFT_GRAMS )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE, loadCellCurrentDrift, loadCellPreviousDrift )
+        }
     }
 }