Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r8c195e4b22d63a6b8de9089ff6bf704282f54885 -r96b0388afcefcd34c63b79c89c3d9b1585c54d31
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8c195e4b22d63a6b8de9089ff6bf704282f54885)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 96b0388afcefcd34c63b79c89c3d9b1585c54d31)
@@ -886,7 +886,7 @@
 {
     U32 cmd;
 
-    if ( sizeof( U32 ) == message->hdr.payloadLen )
+    if ( message->hdr.payloadLen == sizeof( U32 ) )
     {
         memcpy( &cmd, &message->payload[0], sizeof( U32 ) );
         signalInitiateStandbyDisinfectSubmode( cmd );
@@ -1212,9 +1212,9 @@
  * @param message a pointer to the message to handle
  * @return none.
  *************************************************************************/
-void handleInstallationConfirm(  MESSAGE_T *message )
+void handleInstallationConfirm( MESSAGE_T *message )
 {
-    if ( 0 == message->hdr.payloadLen )
+    if ( message->hdr.payloadLen == 0)
     {
         signalUserConfirmInstallation();
     }
@@ -3158,7 +3158,7 @@
 void handleUIVersionResponse( MESSAGE_T *message )
 {
     // Get UI version data and have it recorded
-    if ( sizeof(UI_VERSIONS_T) == message->hdr.payloadLen )
+    if ( message->hdr.payloadLen == sizeof(UI_VERSIONS_T) )
     {
         UI_VERSIONS_T uiVersion;
 
@@ -7195,7 +7195,7 @@
     DG_OP_MODE_T currentDGMode = getDGOpMode();
     REQUEST_REJECT_REASON_CODE_T reject;
 
-    if ( 0 == message->hdr.payloadLen )
+    if ( message->hdr.payloadLen == 0 )
     {
         if ( ( MODE_STAN == currentMode ) || ( MODE_FAUL == currentMode ) )
         {