Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -rf9d86272e3f352766e48ecc71189c0b6c8106bc1 -r24e36c236babfb412d8bbea7485de24f025bb500
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision f9d86272e3f352766e48ecc71189c0b6c8106bc1)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 24e36c236babfb412d8bbea7485de24f025bb500)
@@ -574,7 +574,7 @@
 
             dialyzerDialysateVolume = getDialyzerDialysateVolume();
             // Calculate the time out value that must passed prior to checking for the steady state volume in the reservoir
-            primeDialysateDialyzerTimeLimit = (U32)( ( ( DIALYSATE_DIALYZER_TUBE_VOLUME_ML + dialyzerDialysateVolume ) * 60 ) / DIALYSATE_PUMP_PRIME_FLOW_RATE_ML_MIN );
+            primeDialysateDialyzerTimeLimit = (U32)( ( ( DIALYSATE_DIALYZER_TUBE_VOLUME_ML + dialyzerDialysateVolume ) * 60 ) / DIALYSATE_PUMP_PRIME_FLOW_RATE_ML_MIN ) * MS_PER_SECOND;
             minimumReservoirVolume = getLoadCellWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
             steadyVolumeCount = 0;
             steadyVolumeSamplingStartTime = getMSTimerCount();
@@ -649,7 +649,7 @@
         steadyVolumeSamplingStartTime = getMSTimerCount();
     }
 
-    if ( TRUE == didTimeout( primeDialysateDialyzerStartTime, primeDialysateDialyzerTimeLimit + 55 ) )
+    if ( TRUE == didTimeout( primeDialysateDialyzerStartTime, primeDialysateDialyzerTimeLimit + 55 * MS_PER_SECOND ) )
     {
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT, primeDialysateDialyzerTimeLimit );
     }
@@ -806,7 +806,7 @@
         steadyVolumeSamplingStartTime = getMSTimerCount();
     }
 
-    if ( TRUE == didTimeout( primeDialysateBypassStartTime, PRIME_DIALYSATE_BYPASS_TIME_LIMIT + 55 ) )  // allocate 55 seconds for the steady state logic to do its job before timing out
+    if ( TRUE == didTimeout( primeDialysateBypassStartTime, PRIME_DIALYSATE_BYPASS_TIME_LIMIT + 55 * MS_PER_SECOND ) )  // allocate 55 seconds for the steady state logic to do its job before timing out
     {
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT, PRIME_DIALYSATE_BYPASS_TIME_LIMIT );
     }