Index: firmware/App/Services/StateServices/Prime.c
===================================================================
diff -u -r6c933adfd50a0bc041dc29f4bfa15de5e9f4843a -re846784bfdaca30bd3566eae1bfe824c9723ee16
--- firmware/App/Services/StateServices/Prime.c	(.../Prime.c)	(revision 6c933adfd50a0bc041dc29f4bfa15de5e9f4843a)
+++ firmware/App/Services/StateServices/Prime.c	(.../Prime.c)	(revision e846784bfdaca30bd3566eae1bfe824c9723ee16)
@@ -310,8 +310,8 @@
 
         case PRIME_WAIT_FOR_DIALYSATE_READY_STATE:
             signalBloodPumpHardStop();
-            setValvePosition( H1_VALV, VALVE_POSITION_B_OPEN );
-            setValvePosition( H19_VALV, VALVE_POSITION_B_OPEN );
+            setValvePosition( H1_VALV, VALVE_POSITION_C_CLOSE );
+            setValvePosition( H19_VALV, VALVE_POSITION_C_CLOSE );
             break;
 
         case PRIME_DC_INITIAL_DIALYSATE_STATE:
@@ -325,7 +325,7 @@
         case PRIME_WAIT_FOR_AIR_TRAP_FILL_STATE:
             cmdBypassDialyzer( TRUE );
             setValvePosition( H1_VALV, VALVE_POSITION_C_CLOSE );
-            setBloodPumpTargetFlowRate( INITIAL_SET_BLOOD_FLOW_RATE, MOTOR_DIR_FORWARD,
+            setBloodPumpTargetFlowRate( RECIRC_SET_BLOOD_FLOW_RATE, MOTOR_DIR_FORWARD,
                                         PUMP_CONTROL_MODE_OPEN_LOOP );
             startAirTrapControl();
             break;
@@ -410,7 +410,7 @@
     TD_PRIME_STATE_T priorPrimeState = currentPrimeState;
 
     // Does alarm indicate stop?
-    if ( TRUE == doesAlarmStatusIndicateStop() )
+    if ( ( TRUE == doesAlarmStatusIndicateStop() ) && ( PRIME_PAUSE_STATE != currentPrimeState ) )
     {
         setPrimeStateTransition( PRIME_PAUSE_STATE );
         currentPrimeState = PRIME_PAUSE_STATE;
@@ -907,7 +907,6 @@
 static TD_PRIME_STATE_T handlePrimeDCInitialDialyzerState( void )
 {
     TD_PRIME_STATE_T state = PRIME_DC_INITIAL_DIALYSATE_STATE;
-    F32 venPres = getFilteredVenousPressure();
 
     if ( DD_GEND_DIALYSATE_DELIVERY_STATE == getCurrentGenDState() )
     {
@@ -1072,7 +1071,7 @@
 
     if ( DD_GEND_PRIME_FLUID_DISCARD_STATE == getCurrentGenDState() )
     {
-        if ( TRUE == didTimeout( stateEntryTimerCtr, dcInitialPrimeInterval ) )
+        if ( TRUE == didTimeout( stateEntryTimerCtr, dcDiscardAndRevPrimeInterval ) )
         {
             setPrimeStateTransition( PRIME_COMPLETE_STATE );
             state = PRIME_COMPLETE_STATE;