Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -rf90e1ab6241f06d7439e3b7b6060862c7e20042d
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision f90e1ab6241f06d7439e3b7b6060862c7e20042d)
@@ -91,7 +91,7 @@
 #define FIVE_PCT_OVER_ALLOWANCE                       1.05                                  ///< Allow 5 percent over target before alarming on over travel.
 
 /// Expected position of empty in relation to home postion.
-#define SYRINGE_PUMP_EMPTY_POS                        ( SYRINGE_ENCODER_COUNTS_PER_ML * 11.0 )  // TODO - get syringe volume from home to empty (11 mL is placeholder)
+#define SYRINGE_PUMP_EMPTY_POS                        ( SYRINGE_ENCODER_COUNTS_PER_ML * 10.84 )
 /// Margin of error for empty position determination.
 #define SYRINGE_PUMP_EMPTY_POS_MARGIN                 ( SYRINGE_ENCODER_COUNTS_PER_ML * 0.5 )
 /// Minimum retract position.
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -ree53e23ebcd35a6ef258ecf2f24a47dd47be71b0 -rf90e1ab6241f06d7439e3b7b6060862c7e20042d
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision ee53e23ebcd35a6ef258ecf2f24a47dd47be71b0)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision f90e1ab6241f06d7439e3b7b6060862c7e20042d)
@@ -637,7 +637,7 @@
 static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeDialysateBypassState( void )
 {
     HD_PRE_TREATMENT_PRIME_STATE_T state = HD_PRIME_DIALYSATE_BYPASS_STATE;
-    F32 const loadcellWeight = getLoadCellWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
+    F32 const loadcellWeight = getLoadCellWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
     F32 const weightChange = fabs( 1.0 - ( previousLoadCellReading / loadcellWeight ) );
 
     if ( weightChange < LOAD_CELL_VOLUME_NOISE_TOLERANCE )
@@ -735,7 +735,7 @@
 {
     HD_PRE_TREATMENT_PRIME_STATE_T state = HD_PRIME_DIALYSATE_DIALYZER_STATE;
 
-    F32 const loadcellWeight = getLoadCellWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
+    F32 const loadcellWeight = getLoadCellWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
 
     F32 const weightChange = fabs( 1.0 - ( previousLoadCellReading / loadcellWeight ) );