diff --git a/ChangeLog b/ChangeLog
index 715ff15a4a0..2c06338c7f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2396,10 +2396,10 @@
 	* arch/arm/src/stm32/stm32_i2c.c: Add support for I2C3
 	* drivers/usbdev/: Lots of name changes: cdc_serial->cdcacm, usbstrg->usbmsc, 
 	  usbser->pl2303
-	* drivers/usbdev/composite*: Fleshed out support for a composite USB device.
+	* drivers/usbdev/composite: Fleshed out support for a composite USB device.
 	* drivers/stm3210e-eval/composite and drivers/stm3210e-eval/src/up_composite.c:
 	  Add a configuration test the USB composite device.
 	* include/nuttx/usb/usb.h, drivers/usbdev/composite_descriptors.c, and
 	  drivers/usbdev/cdcacm_descriptors.c:  Add support for the USB Interface
           Association Descriptor (IAD)
-
+	* arch/arm/src/stm32/stm32_i2c.c: Correct a typo in STM32 I2C3 support
diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c
index 38551231d99..4439cfec00d 100644
--- a/arch/arm/src/stm32/stm32_i2c.c
+++ b/arch/arm/src/stm32/stm32_i2c.c
@@ -1209,7 +1209,7 @@ static int stm32_i2c2_isr(int irq, void *context)
  ************************************************************************************/
 
 #ifdef CONFIG_STM32_I2C3
-static int stm32_i2c2_isr(int irq, void *context)
+static int stm32_i2c3_isr(int irq, void *context)
 {
   return stm32_i2c_isr(&stm32_i2c3_priv);
 }
diff --git a/drivers/usbdev/composite.c b/drivers/usbdev/composite.c
index bfd5a020190..aae4f45815f 100644
--- a/drivers/usbdev/composite.c
+++ b/drivers/usbdev/composite.c
@@ -489,14 +489,18 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
                     {
                       ret = composite_mkstrdesc(strid, buf);
                     }
-                  else if (strid < DEV1_STRIDBASE + DEV1_NSTRIDS)
+#if DEV1_NSTRIDS > 0
+                  else if (strid <= DEV1_STRIDBASE + DEV1_NSTRIDS)
                     {
                       ret = DEV1_MKSTRDESC(strid, buf);
                     }
-                  else if (strid < DEV2_STRIDBASE + DEV2_NSTRIDS)
+#endif
+#if DEV2_NSTRIDS > 0
+                  else if (strid <= DEV2_STRIDBASE + DEV2_NSTRIDS)
                     {
                       ret = DEV2_MKSTRDESC(strid, buf);
                     }
+#endif
                 }
                 break;