diff --git a/lib_stusb/STM32_USB_Device_Library/Class/CCID/src/usbd_ccid_cmd.c b/lib_stusb/STM32_USB_Device_Library/Class/CCID/src/usbd_ccid_cmd.c
index 31e4759a4..0682de887 100644
--- a/lib_stusb/STM32_USB_Device_Library/Class/CCID/src/usbd_ccid_cmd.c
+++ b/lib_stusb/STM32_USB_Device_Library/Class/CCID/src/usbd_ccid_cmd.c
@@ -231,28 +231,28 @@ uint8_t  PC_to_RDR_XfrBlock(void)
   if (error != 0) 
     return error;
     
-    if (G_io_ccid.bulk_header.bulkout.dwLength > IO_CCID_DATA_BUFFER_SIZE)
-    { /* Check amount of Data Sent by Host is > than memory allocated ? */
+  if (G_io_ccid.bulk_header.bulkout.dwLength > IO_CCID_DATA_BUFFER_SIZE)
+  { /* Check amount of Data Sent by Host is > than memory allocated ? */
      
-      return SLOTERROR_BAD_DWLENGTH;
-    }
+    return SLOTERROR_BAD_DWLENGTH;
+  }
 
 
-    /* wLevelParameter = Size of expected data to be returned by the 
-                          bulk-IN endpoint */
-    expectedLength = (G_io_ccid.bulk_header.bulkout.bSpecific_2 << 8) | 
-                      G_io_ccid.bulk_header.bulkout.bSpecific_1;   
+  /* wLevelParameter = Size of expected data to be returned by the 
+                        bulk-IN endpoint */
+  expectedLength = (G_io_ccid.bulk_header.bulkout.bSpecific_2 << 8) | 
+                    G_io_ccid.bulk_header.bulkout.bSpecific_1;   
 
-    reqlen = G_io_ccid.bulk_header.bulkout.dwLength;
-    
-    G_io_ccid.bulk_header.bulkin.dwLength = (uint16_t)expectedLength;  
+  reqlen = G_io_ccid.bulk_header.bulkout.dwLength;
 
+  G_io_ccid.bulk_header.bulkin.dwLength = (uint16_t)expectedLength;  
 
-    error = SC_XferBlock(&G_io_ccid_data_buffer[0], 
-                     reqlen, 
-                     &expectedLength); 
 
-   if (error != SLOT_NO_ERROR)
+  error = SC_XferBlock(&G_io_ccid_data_buffer[0], 
+                   reqlen, 
+                   &expectedLength); 
+
+  if (error != SLOT_NO_ERROR)
   {
     CCID_UpdateCommandStatus(BM_COMMAND_STATUS_FAILED, BM_ICC_PRESENT_ACTIVE);
   }
@@ -639,7 +639,6 @@ uint8_t  PC_TO_RDR_SetDataRateAndClockFrequency(void)
   uint8_t error;
   uint32_t clockFrequency;
   uint32_t dataRate;
-  uint32_t temp =0;
   
   error = CCID_CheckCommandParams(CHK_PARAM_SLOT |\
     CHK_PARAM_CARD_PRESENT |\
diff --git a/lib_stusb/STM32_USB_Device_Library/Class/CCID/src/usbd_ccid_if.c b/lib_stusb/STM32_USB_Device_Library/Class/CCID/src/usbd_ccid_if.c
index ef0302615..8b073c2ce 100644
--- a/lib_stusb/STM32_USB_Device_Library/Class/CCID/src/usbd_ccid_if.c
+++ b/lib_stusb/STM32_USB_Device_Library/Class/CCID/src/usbd_ccid_if.c
@@ -206,6 +206,7 @@ void CCID_BulkMessage_Out (USBD_HandleTypeDef  *pdev,
       G_io_ccid.Ccid_BulkState = CCID_STATE_IDLE;
       // no break is intentional
 
+    __attribute__((fallthrough));
     case CCID_STATE_IDLE:
       // prepare to receive another packet later on (to avoid troubles with timeout due to other hid command timeouting the ccid endpoint reply)
       USBD_LL_PrepareReceive(pdev, CCID_BULK_OUT_EP, CCID_BULK_EPOUT_SIZE);