diff --git a/drivers/usbdev/usbdev_storage.c b/drivers/usbdev/usbdev_storage.c
index f2bd03b02b..360756b123 100644
--- a/drivers/usbdev/usbdev_storage.c
+++ b/drivers/usbdev/usbdev_storage.c
@@ -151,11 +151,6 @@ static struct usbdevclass_driverops_s g_driverops =
 /****************************************************************************
  * Public Data
  ****************************************************************************/
-/* String *******************************************************************/
-
-const char g_vendorstr[]  = CONFIG_USBSTRG_VENDORSTR;
-const char g_productstr[] = CONFIG_USBSTRG_PRODUCTSTR;
-const char g_serialstr[]  = CONFIG_USBSTRG_SERIALSTR;
 
 /****************************************************************************
  * Private Functions
diff --git a/drivers/usbdev/usbdev_stordesc.c b/drivers/usbdev/usbdev_stordesc.c
index f2791e9465..68dffa96ce 100644
--- a/drivers/usbdev/usbdev_stordesc.c
+++ b/drivers/usbdev/usbdev_stordesc.c
@@ -66,7 +66,6 @@
  * Private Data
  ****************************************************************************/
 /* Descriptors **************************************************************/
-
 /* Device descriptor */
 
 static const struct usb_devdesc_s g_devdesc =
@@ -196,6 +195,15 @@ static const struct usb_epdesc_s g_hsepbulkindesc =
 };
 #endif
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+/* Strings ******************************************************************/
+
+const char g_vendorstr[]  = CONFIG_USBSTRG_VENDORSTR;
+const char g_productstr[] = CONFIG_USBSTRG_PRODUCTSTR;
+const char g_serialstr[]  = CONFIG_USBSTRG_SERIALSTR;
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
diff --git a/fs/fat/fs_fat32dirent.c b/fs/fat/fs_fat32dirent.c
index 6dfdc2022d..6e6d82d10d 100644
--- a/fs/fat/fs_fat32dirent.c
+++ b/fs/fat/fs_fat32dirent.c
@@ -1133,7 +1133,7 @@ static bool fat_cmplfname(const uint8_t *direntry, const uint8_t *substr)
   match = fat_cmplfnchunk(chunk, substr, 5);
   if (match && len >= 5)
     {
-      /* Check bytes 6-11.  Note that len == 5, the substring passed to
+      /* Check bytes 6-11.  Note that if len == 5, the substring passed to
        * fat_cmplfnchunk() will point to the NUL terminator of substr.
        * In this case, fat_cmplfnchunk() will only verify that the
        * directory entry is also NUL terminated.
@@ -1143,7 +1143,7 @@ static bool fat_cmplfname(const uint8_t *direntry, const uint8_t *substr)
       match = fat_cmplfnchunk(chunk, &substr[5], 6);
       if (match && len >= 11)
         {
-          /* Check bytes 12-13.  Note that len == 11, the substring passed to
+          /* Check bytes 12-13.  Note that if len == 11, the substring passed to
            * fat_cmplfnchunk() will point to the NUL terminator of substr.
            * In this case, fat_cmplfnchunk() will only verify that the
            * directory entry is also NUL terminated.