diff --git a/src/flash/nor/fespi.c b/src/flash/nor/fespi.c
index 925dd6fad..cf8616410 100644
--- a/src/flash/nor/fespi.c
+++ b/src/flash/nor/fespi.c
@@ -189,7 +189,9 @@ FLASH_BANK_COMMAND_HANDLER(fespi_flash_bank_command)
 	fespi_info->probed = 0;
 	fespi_info->ctrl_base = 0;
 	if (CMD_ARGC >= 6) {
-	  COMMAND_PARSE_NUMBER(int, CMD_ARGV[6], fespi_info->ctrl_base);
+          int temp;
+	  COMMAND_PARSE_NUMBER(int, CMD_ARGV[6], temp);
+          fespi_info->ctrl_base = (uint32_t) temp;
 	  LOG_DEBUG("ASSUMING FESPI device at ctrl_base = 0x%x", fespi_info->ctrl_base);
 	}
 
@@ -1049,8 +1051,7 @@ static int fespi_probe(struct flash_bank *bank)
 	    return ERROR_FAIL;
 	  }
 
-	  ctrl_base = target_device->ctrl_base;
-	  fespi_info->ctrl_base = ctrl_base;
+	  fespi_info->ctrl_base = target_device->ctrl_base;
 
 	  LOG_DEBUG("Valid FESPI on device %s at address 0x%" PRIx32,
 		    target_device->name, bank->base);
@@ -1060,6 +1061,7 @@ static int fespi_probe(struct flash_bank *bank)
 		    fespi_info->ctrl_base,
 		    bank->base);
 	}
+        ctrl_base = fespi_info->ctrl_base;
 
 	/* read and decode flash ID; returns in SW mode */
 	FESPI_WRITE_REG(FESPI_REG_TXCTRL, FESPI_TXWM(1));
diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c
index 80859b680..e86da0523 100644
--- a/src/target/riscv/riscv.c
+++ b/src/target/riscv/riscv.c
@@ -503,8 +503,8 @@ static int riscv_run_algorithm(struct target *target, int num_mem_params,
 		int64_t now = timeval_ms();
 		if (now - start > timeout_ms) {
 			LOG_ERROR("Algorithm timed out after %d ms.", timeout_ms);
-			LOG_ERROR("  now   = 0x%08x", now);
-			LOG_ERROR("  start = 0x%08x", start);
+			LOG_ERROR("  now   = 0x%08x", (uint32_t) now);
+			LOG_ERROR("  start = 0x%08x", (uint32_t) start);
 			riscv_halt(target);
 			riscv_openocd_poll(target);
 			return ERROR_TARGET_TIMEOUT;