Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -ra845adaa2966fbc6348e62ee6b2c92c209d6bf03 -r914d2516d2365904d2f487539868f012dfa05782
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision a845adaa2966fbc6348e62ee6b2c92c209d6bf03)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 914d2516d2365904d2f487539868f012dfa05782)
@@ -203,6 +203,8 @@
 {
     PUMP_CONTROL_MODE_T mode = PUMP_CONTROL_MODE_CLOSED_LOOP;
 
+    doorClosedRequired( TRUE, TRUE );
+
     // Set last UF timestamp so UF ref is resumed from this time
     lastUFTimeStamp = getMSTimerCount();
     // Send dialysate outlet pump latest UF volumes
@@ -343,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();
@@ -1272,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 )
+        }
     }
 }