diff --git a/firmware/hw_layer/mass_storage/usb_msd_cfg.c b/firmware/hw_layer/mass_storage/usb_msd_cfg.c
index 75e3a30f7b..56b76ff278 100644
--- a/firmware/hw_layer/mass_storage/usb_msd_cfg.c
+++ b/firmware/hw_layer/mass_storage/usb_msd_cfg.c
@@ -114,10 +114,10 @@ static const uint8_t msd_string1[] = {
  * Device Description string.
  */
 static const uint8_t msd_string2[] = {
-  USB_DESC_BYTE(62),                    /* bLength.                         */
+  USB_DESC_BYTE(58),                    /* bLength.                         */
   USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */
-  'C', 0, 'h', 0, 'i', 0, 'b', 0, 'i', 0, 'O', 0, 'S', 0, '/', 0,
-  'R', 0, 'T', 0, ' ', 0, 'M', 0, 'a', 0, 's', 0, 's', 0, ' ', 0,
+  'r', 0, 'u', 0, 's', 0, 'E', 0, 'f', 0, 'i', 0, 
+  ' ', 0, 'M', 0, 'a', 0, 's', 0, 's', 0, ' ', 0,
   'S', 0, 't', 0, 'o', 0, 'r', 0, 'a', 0, 'g', 0, 'e', 0, ' ', 0,
   'D', 0, 'e', 0, 'v', 0, 'i', 0, 'c', 0, 'e', 0
 };
diff --git a/win32_functional_tests/Makefile b/win32_functional_tests/Makefile
index 4d85d6dc6f..70e68eac40 100644
--- a/win32_functional_tests/Makefile
+++ b/win32_functional_tests/Makefile
@@ -216,8 +216,11 @@ $(PORTINC) $(KERNINC) $(TESTINC) \
 
 #MCU  = cortex-m4
 
+
 ifeq ($(OS),Windows_NT)
-  TRGT = i686-pc-mingw32-
+  #Cygwin64 is used with mingw64 32-bit version
+
+  TRGT = i686-w64-mingw32-
 else
   TRGT = 
 endif