diff --git a/src/fdc.c b/src/fdc.c
index e7f110440..6e5aa6869 100644
--- a/src/fdc.c
+++ b/src/fdc.c
@@ -1491,7 +1491,7 @@ void fdc_callback(void *priv)
                 case -1: /*Reset*/
                 fdc_int();
 		fdc.fintr = 0;
-		memset(fdc.pcn, 0, 4);
+		memset(fdc.pcn, 0, 4 * sizeof(int));
                 fdc_reset_stat = 4;
                 return;
 		case 1: /*Mode*/
diff --git a/src/hdd.c b/src/hdd.c
index 04bf423d9..63160f5fe 100644
--- a/src/hdd.c
+++ b/src/hdd.c
@@ -26,16 +26,16 @@ static struct
         int is_mfm;
 } hdd_controllers[] = 
 {
-        {"None",                  "none",     &null_hdd_device, 0},
-        {"AT Fixed Disk Adapter", "mfm_at",   &mfm_at_device,   1},
-        {"DTC 5150X",                   "dtc5150x",  &dtc_5150x_device, 1},
-        {"Fixed Disk Adapter (Xebec)",  "mfm_xebec", &mfm_xebec_device, 1},
-        {"IBM ESDI Fixed Disk Adapter (MCA)", "esdi_mca",  &hdd_esdi_device,  1},
-        {"Western Digital WD1007V-SE1 (ESDI)","wd1007vse1", &wd1007vse1_device, 0},
-        {"XTIDE",                 "xtide",    &xtide_device,    0},
-        {"XTIDE (AT)",            "xtide_at", &xtide_at_device, 0},
-        {"XTIDE (Acculogic)",          "xtide_ps2",&xtide_ps2_device,0},
-        {"XTIDE (AT) (1.1.5)",     "xtide_at_ps2",&xtide_at_ps2_device,0},
+        {"None",					"none",		&null_hdd_device,	0},
+        {"[MFM] AT Fixed Disk Adapter",			"mfm_at",	&mfm_at_device,		1},
+        {"[MFM] DTC 5150X",				"dtc5150x",	&dtc_5150x_device,	1},
+        {"[MFM] Fixed Disk Adapter (Xebec)",		"mfm_xebec",	&mfm_xebec_device,	1},
+        {"[ESDI] IBM ESDI Fixed Disk Adapter",		"esdi_mca",	&hdd_esdi_device,	1},
+        {"[ESDI] Western Digital WD1007V-SE1",		"wd1007vse1",	&wd1007vse1_device,	0},
+        {"[IDE] XTIDE",					"xtide",	&xtide_device,		0},
+        {"[IDE] XTIDE (Acculogic)",			"xtide_ps2",	&xtide_ps2_device,	0},
+        {"[IDE] XTIDE (AT)",				"xtide_at",	&xtide_at_device,	0},
+        {"[IDE] XTIDE (AT) (1.1.5)",			"xtide_at_ps2",	&xtide_at_ps2_device,	0},
         {"", "", NULL, 0}
 };
 
diff --git a/src/keyboard.c b/src/keyboard.c
index 7a60c5a62..d551fa622 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -422,7 +422,7 @@ static int scorder[272] = {0x38, 0xB8, 0x1D, 0x9D, 0xFF, 0x2A, 0x36,0x103, 0x00,
 			   0xFE,0x100,0x101,0x102,0x104,0x105,0x106,0x107,0x108,0x109,0x10A,0x10B,0x10C,0x10D,0x10E,0x10F};
 
 /* bit 0 = repeat, bit 1 = makes break code? */
-int set3_flags[272];
+uint8_t set3_flags[272];
 uint8_t set3_all_repeat = 0;
 uint8_t set3_all_break = 0;
 
diff --git a/src/keyboard.h b/src/keyboard.h
index 217f1cee1..0c3a1b651 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -24,6 +24,6 @@ extern int pcem_key[272];
 extern uint8_t mode;
 void keyboard_process();
 
-extern int set3_flags[272];
+extern uint8_t set3_flags[272];
 extern uint8_t set3_all_repeat;
 extern uint8_t set3_all_break;