Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -re832be54a818fe1af79b225e4b43cd148be89fa4 -ra265ac3cc10384a1119240d21f57833c9cb33c5b
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e832be54a818fe1af79b225e4b43cd148be89fa4)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a265ac3cc10384a1119240d21f57833c9cb33c5b)
@@ -795,7 +795,7 @@
     // If we've reached our target fill to volume (by weight), we're done filling - go back to generation idle mode  // SRSDG 398
     if ( TRUE == hasTargetFillVolumeBeenReached( inactiveReservoir ) )
     {
-        F32 filledVolumeML                           = getReservoirWeight( inactiveReservoir ) - reservoirBaseWeight;
+        F32 filledVolumeML                           = getReservoirWeight( inactiveRsrvr ) - reservoirBaseWeight;
         F32 integratedVolumeToLoadCellReadingPercent = fabs( 1.0F - ( filledVolumeML / getIntegratedVolumeML() ) );
         F32 avgAcidConductivity                      = acidConductivityTotal / conductivitySampleCount;
         F32 avgBicarbConductivity                    = bicarbConductivityTotal / conductivitySampleCount;
Index: firmware/App/Services/PIControllers.h
===================================================================
diff -u -r3ed56772e4ca7f562dd3647ee56396d63ea0a077 -ra265ac3cc10384a1119240d21f57833c9cb33c5b
--- firmware/App/Services/PIControllers.h	(.../PIControllers.h)	(revision 3ed56772e4ca7f562dd3647ee56396d63ea0a077)
+++ firmware/App/Services/PIControllers.h	(.../PIControllers.h)	(revision a265ac3cc10384a1119240d21f57833c9cb33c5b)
@@ -71,7 +71,7 @@
 void resetPIController( PI_CONTROLLER_ID_T controllerID, F32 initialControlSignal );
 F32 runPIController( PI_CONTROLLER_ID_T controllerID, F32 referenceSignal, F32 measuredSignal );
 F32 getPIControllerSignals( PI_CONTROLLER_ID_T controllerID, PI_CONTROLLER_SIGNALS_ID signalID );
-void setPIControllerStepLimit( PI_CONTROLLER_ID_T controllerID, PI_CONTROLLER_SIGNALS_ID signalID, F32 stepLimit );
+void setPIControllerStepLimit( PI_CONTROLLER_ID_T controllerID, F32 stepLimit );
 
 /**@}*/
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r2ee6757cc12428790724f5a46d689675ea0e4e38 -ra265ac3cc10384a1119240d21f57833c9cb33c5b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2ee6757cc12428790724f5a46d689675ea0e4e38)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a265ac3cc10384a1119240d21f57833c9cb33c5b)
@@ -3761,34 +3761,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleCpldStatusRequest function handles a CPLD Status request message.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleCpldStatusRequest( MESSAGE_T *message )
-{
-    MESSAGE_T msg;
-    CPLD_STATUS_T payload;
-    U08 *payloadPtr = msg.payload;
-
-    // populate payload
-    getCPLDStatus( &payload );
-    // create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_CPLD_STATUS;
-    msg.hdr.payloadLen = sizeof( CPLD_STATUS_T );
-
-    // fill message payload
-    memcpy( payloadPtr, &payload, sizeof( CPLD_STATUS_T ) );
-
-    // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-    serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED );
-}
-
-/*********************************************************************//**
- * @brief
  * The handleTestDrainPumpMeasuredCurrentOverride function handles a request
  * to override the drain pump measured current
  * @details Inputs: none