diff --git a/src/dev.c b/src/dev.c
index b2e61281..e70f93de 100644
--- a/src/dev.c
+++ b/src/dev.c
@@ -306,9 +306,9 @@ BOOL GetOpticalMedia(IMG_SAVE* img_save)
 /* For debugging user reports of HDDs vs UFDs */
 //#define FORCED_DEVICE
 #ifdef FORCED_DEVICE
-#define FORCED_VID 0x0409
-#define FORCED_PID 0x005A
-#define FORCED_NAME "TOSHIBA TransMemory USB Device"
+#define FORCED_VID 0x056E
+#define FORCED_PID 0x8008
+#define FORCED_NAME "Generic- USB3.0 CRW   -SD USB Device"
 #endif
 
 /*
diff --git a/src/hdd_vs_ufd.h b/src/hdd_vs_ufd.h
index 87918431..2053cdab 100644
--- a/src/hdd_vs_ufd.h
+++ b/src/hdd_vs_ufd.h
@@ -117,6 +117,7 @@ static vid_score_t vid_score[] = {
 	{ 0x04e8, 5 },		// Samsung
 	{ 0x04f3, -5 },		// Elan
 	{ 0x04fc, 5 },		// Sunplus
+	{ 0x056e, -5 },		// Elecom
 	{ 0x058f, -5 },		// Alcor
 	{ 0x059b, 7 },		// Iomega
 	{ 0x059f, 5 },		// LaCie
diff --git a/src/rufus.rc b/src/rufus.rc
index 4eed5dec..ba69a8ed 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 2.18.1220"
+CAPTION "Rufus 2.18.1221"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -366,8 +366,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,18,1220,0
- PRODUCTVERSION 2,18,1220,0
+ FILEVERSION 2,18,1221,0
+ PRODUCTVERSION 2,18,1221,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -384,13 +384,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.18.1220"
+            VALUE "FileVersion", "2.18.1221"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.18.1220"
+            VALUE "ProductVersion", "2.18.1221"
         END
     END
     BLOCK "VarFileInfo"