diff --git a/src/config.c b/src/config.c
index 278dfa442..8c3da65ea 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1118,12 +1118,12 @@ load_storage_controllers(void)
     if (strlen(p) > 511)
 	fatal("load_storage_controllers(): strlen(p) > 511\n");
     else
-	strncpy(cassette_fname, p, strlen(p) + 1);
+	strncpy(cassette_fname, p, MIN(511, strlen(p) + 1));
     p = config_get_string(cat, "cassette_mode", "");
     if (strlen(p) > 511)
 	fatal("load_storage_controllers(): strlen(p) > 511\n");
     else
-	strncpy(cassette_mode, p, strlen(p) + 1);
+	strncpy(cassette_mode, p, MIN(511, strlen(p) + 1));
     cassette_pos = config_get_int(cat, "cassette_position", 0);
     cassette_srate = config_get_int(cat, "cassette_srate", 44100);
     cassette_append = !!config_get_int(cat, "cassette_append", 0);
diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index 3bec37f6b..0cc901538 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -1457,7 +1457,7 @@ machine_at_arb1479_init(const machine_t *model)
     device_add(&w83977f_device);
     device_add(&keyboard_ps2_ami_pci_device);
     device_add(&stpc_consumer2_device);
-    device_add(&sst_flash_39sf020_device);
+    device_add(&winbond_flash_w29c020_device);
 
     return ret;
 }