diff --git a/src/config.c b/src/config.c
index cc8e73ca4..d95e06f1f 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1094,7 +1094,7 @@ load_floppy_and_cdrom_drives(void)
             ini_section_delete_var(cat, temp);
         }
         for (int i = 0; i < MAX_PREV_IMAGES; i++) {
-            fdd_image_history[c][i] = (char *) calloc(MAX_IMAGE_PATH_LEN + 1, sizeof(char));
+            fdd_image_history[c][i] = (char *) calloc((MAX_IMAGE_PATH_LEN + 1) << 1, sizeof(char));
             sprintf(temp, "fdd_%02i_image_history_%02i", c + 1, i + 1);
             p = ini_section_get_string(cat, temp, NULL);
             if (p) {
@@ -1210,7 +1210,7 @@ load_floppy_and_cdrom_drives(void)
             cdrom[c].host_drive = 0;
 
         for (int i = 0; i < MAX_PREV_IMAGES; i++) {
-            cdrom[c].image_history[i] = (char *) calloc(MAX_IMAGE_PATH_LEN + 1, sizeof(char));
+            cdrom[c].image_history[i] = (char *) calloc((MAX_IMAGE_PATH_LEN + 1) << 1, sizeof(char));
             sprintf(temp, "cdrom_%02i_image_history_%02i", c + 1, i + 1);
             p = ini_section_get_string(cat, temp, NULL);
             if (p) {
@@ -1343,7 +1343,7 @@ load_other_removable_devices(void)
         }
 
         for (int i = 0; i < MAX_PREV_IMAGES; i++) {
-            zip_drives[c].image_history[i] = (char *) calloc(MAX_IMAGE_PATH_LEN + 1, sizeof(char));
+            zip_drives[c].image_history[i] = (char *) calloc((MAX_IMAGE_PATH_LEN + 1) << 1, sizeof(char));
             sprintf(temp, "zip_%02i_image_history_%02i", c + 1, i + 1);
             p = ini_section_get_string(cat, temp, NULL);
             if (p) {
@@ -1459,7 +1459,7 @@ load_other_removable_devices(void)
         }
 
         for (int i = 0; i < MAX_PREV_IMAGES; i++) {
-            mo_drives[c].image_history[i] = (char *) calloc(MAX_IMAGE_PATH_LEN + 1, sizeof(char));
+            mo_drives[c].image_history[i] = (char *) calloc((MAX_IMAGE_PATH_LEN + 1) << 1, sizeof(char));
             sprintf(temp, "mo_%02i_image_history_%02i", c + 1, i + 1);
             p = ini_section_get_string(cat, temp, NULL);
             if (p) {
diff --git a/src/video/vid_xga.c b/src/video/vid_xga.c
index 58b4413a2..f53ba9bb4 100644
--- a/src/video/vid_xga.c
+++ b/src/video/vid_xga.c
@@ -3364,7 +3364,7 @@ xga_init(const device_t *info)
 
     rom = malloc(xga->bios_rom.sz);
     memset(rom, 0xff, xga->bios_rom.sz);
-    (void) fread(rom, xga->bios_rom.sz, 1, fp);
+    (void) !fread(rom, xga->bios_rom.sz, 1, fp);
     (void) fclose(fp);
 
     xga->bios_rom.rom  = rom;