diff --git a/src/scsi/scsi_buslogic.c b/src/scsi/scsi_buslogic.c
index 8d1b0ae..a836eec 100644
--- a/src/scsi/scsi_buslogic.c
+++ b/src/scsi/scsi_buslogic.c
@@ -1475,10 +1475,10 @@ buslogic_init(device_t *info)
     uint16_t bios_rom_size;
     uint16_t bios_rom_mask;
     uint8_t has_autoscsi_rom;
-    wchar_t *autoscsi_rom_name;
+    wchar_t *autoscsi_rom_name = 0;
     uint16_t autoscsi_rom_size;
     uint8_t has_scam_rom;
-    wchar_t *scam_rom_name;
+    wchar_t *scam_rom_name = 0;
     uint16_t scam_rom_size;
     FILE *f;
     buslogic_data_t *bl;
diff --git a/src/scsi/scsi_x54x.c b/src/scsi/scsi_x54x.c
index 661566b..94e4c86 100644
--- a/src/scsi/scsi_x54x.c
+++ b/src/scsi/scsi_x54x.c
@@ -699,6 +699,7 @@ x54x_mbi(x54x_t *dev)
 	DMAPageWrite(Incoming + 1, (uint8_t *)&CCBPointer, 3);
 	x54x_log("%i bytes of 24-bit mailbox written to: %08X\n", sizeof(Mailbox_t), Incoming);
     } else {
+	U32_TO_ADDR(CCBPointer, req->CCBPointer);
 	x54x_log("Mailbox 32-bit: Status=0x%02X, CCB at 0x%04X\n", req->MailboxCompletionCode, CCBPointer);
 	DMAPageWrite(Incoming, (uint8_t *)&(req->CCBPointer), 4);
 	DMAPageWrite(Incoming + 4, &(req->HostStatus), 1);