Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -r07ae59288d41511e9c28460ced5c46fb870cc627 -r677cc9e7b67ea71140271aff307043abbf964764
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 07ae59288d41511e9c28460ced5c46fb870cc627)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 677cc9e7b67ea71140271aff307043abbf964764)
@@ -163,8 +163,6 @@
     // verify given buffer
     if ( buffer < NUM_OF_COMM_BUFFERS )
     {
-//        _disable_IRQ();
-//        _disable_FIQ();
         // verify requested # of bytes to get are in the buffer
         if ( ( len <= ( COMM_BUFFER_LENGTH * DOUBLE_BUFFERS ) ) && ( len <= numberOfBytesInCommBuffer( buffer ) ) )
         {
@@ -188,8 +186,6 @@
                 result += remNumOfBytes;
             }
         }
-//        _enable_FIQ();
-//        _enable_IRQ();
     }
     else // invalid buffer given
     {
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r4d27576bdd7843178d9b69ffff3584ee01ec24fe -r677cc9e7b67ea71140271aff307043abbf964764
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 4d27576bdd7843178d9b69ffff3584ee01ec24fe)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 677cc9e7b67ea71140271aff307043abbf964764)
@@ -53,7 +53,7 @@
 #define MSG_NOT_ACKED_MAX_RETRIES   3
 #define PENDING_ACK_LIST_SIZE       25
 
-#pragma pack(push,1)
+#pragma pack(push, 1)
 
 typedef struct
 {