Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -raa8b9687b9396b4878cf0d5327d72a5d67477761 -r6cbbccc4ba658765d63a4028d16d2423d506a305
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision aa8b9687b9396b4878cf0d5327d72a5d67477761)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 6cbbccc4ba658765d63a4028d16d2423d506a305)
@@ -836,8 +836,6 @@
         data.arterialPressure = shortFilteredArterialPressure;
         data.venousPressure = shortFilteredVenousPressure;
         data.bldPumpOcclusion = getMeasuredBloodPumpOcclusion();
-        data.diPumpOcclusion = 0;  // TODO - remove unused fields
-        data.doPumpOcclusion = 0;
 
         broadcastData( MSG_ID_PRESSURE_OCCLUSION_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( PRESSURE_OCCLUSION_DATA_T ) );
         presOcclDataPublicationTimerCounter = 0;
Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -r6cbbccc4ba658765d63a4028d16d2423d506a305
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 6cbbccc4ba658765d63a4028d16d2423d506a305)
@@ -70,6 +70,7 @@
     DG_OP_MODE_T dgOperationMode = getDGOpMode();
 
     initFaultMode();
+    requestAlarmLampPattern( LAMP_PATTERN_FAULT );  // in case we get here before LED POST can take alarm lamp out of manual control.
     doorClosedRequired( FALSE, FALSE );
     syringeDetectionRequired( FALSE );
 
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -r6cbbccc4ba658765d63a4028d16d2423d506a305
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 6cbbccc4ba658765d63a4028d16d2423d506a305)
@@ -504,7 +504,10 @@
 
         sendUIVersionRequest();                                                              // request UI to send us its version - needed for compatibility check
 
-        sendRequestForDGResendAlarms();                                                      // request DG to re-send any active alarms that may have been triggered before we came up
+        if ( TRUE == isDGCommunicating() )
+        {
+            sendRequestForDGResendAlarms();                                                  // request DG to re-send any active alarms that may have been triggered before we came up
+        }
 
         // Send the startup event
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_STARTUP, systemREG1->DEV, 0x12345678 )          // log startup event w/ device ID bits
Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -r6cbbccc4ba658765d63a4028d16d2423d506a305
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 6cbbccc4ba658765d63a4028d16d2423d506a305)
@@ -537,6 +537,7 @@
             break;
 
         case DRAIN_RESERVOIR_COMPLETE_STATE:
+            // Nothing to be done in this state (terminal state).
             break;
 
         default: