Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rd0c2c5ec93f7fae9772c14e9aa0baec0b20ed5ce -r9bf9b19ed82c7cc8cdb6b0fdcd67401dc1561d58
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision d0c2c5ec93f7fae9772c14e9aa0baec0b20ed5ce)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 9bf9b19ed82c7cc8cdb6b0fdcd67401dc1561d58)
@@ -289,8 +289,11 @@
 
         totalTargetUFVolumeInMl.data = 0.0;
 
-        simulator_inlet_flow_rate = (F32) rxFlowRateinMlPerMin;
 
+        #ifdef DIALOUT_SIMULATOR
+            simulator_inlet_flow_rate = (F32) rxFlowRateinMlPerMin;
+        #endif
+
         rxTotalTargetVolumeInMl = (F32) rxTotalVolumeInMl;
         rxTargetTimeInSamples = (U32) rxTotalTimeInMinutes * SEC_PER_MIN * DIAL_OUT_CONTROLLER_SAMPLE_FREQ ;
         rxInitialTargetFlowRatePWM = RANGE( DOP_PWM_FROM_ML_PER_MIN( rxFlowRateinMlPerMin ), MIN_DIAL_OUT_PUMP_PWM_DUTY_CYCLE, MAX_DIAL_OUT_PUMP_PWM_DUTY_CYCLE );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd0c2c5ec93f7fae9772c14e9aa0baec0b20ed5ce -r9bf9b19ed82c7cc8cdb6b0fdcd67401dc1561d58
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d0c2c5ec93f7fae9772c14e9aa0baec0b20ed5ce)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9bf9b19ed82c7cc8cdb6b0fdcd67401dc1561d58)
@@ -367,7 +367,6 @@
     U32 msgSize;
     U08 data[ sizeof( MESSAGE_WRAPPER_T ) + 1 + CAN_MESSAGE_PAYLOAD_SIZE ];  // must hold full (wrapped) message + sync + any CAN padding
     U08 *payloadPtr = msg.payload;
-    DIALOUT_BROADCASTING_T payload;
 
     // create a message record
     blankMessage( &msg );
@@ -901,9 +900,8 @@
 
     if ( 1 == message->hdr.payloadLen  && NUM_OF_DIALOUT_FLOW_STATES > newState)
     {
-        DIALOUT_FLOW_STATE_T actualNewState  = setDialOutFlowNewState( newState, isBagChanged );
+        isItAValidArgument  = setDialOutFlowNewState( newState, isBagChanged );
 
-        isItAValidArgument = (actualNewState == newState) ? TRUE : FALSE;
     }
 
     // respond to would be tester