diff --git a/common/cmd_flashwrite.c b/common/cmd_flashwrite.c
index 14220a5b14..efb026e47e 100644
--- a/common/cmd_flashwrite.c
+++ b/common/cmd_flashwrite.c
@@ -205,7 +205,7 @@ char * const argv[])
 	uint32_t offset, part_size, adj_size;
 	uint32_t load_addr = 0;
 	uint32_t file_size = 0;
-	uint32_t size_block, start_block, file_size_cpy;
+	uint32_t size_block, start_block, file_size_cpy = 0;
 	char *part_name = NULL, *filesize, *loadaddr;
 	int flash_type, ret;
 	unsigned int active_part = 0;
diff --git a/drivers/mtd/nand/qpic_nand.c b/drivers/mtd/nand/qpic_nand.c
index 711725c3c1..b78af00e8a 100644
--- a/drivers/mtd/nand/qpic_nand.c
+++ b/drivers/mtd/nand/qpic_nand.c
@@ -2510,7 +2510,7 @@ static const struct nand_flash_dev *flash_get_dev(uint8_t dev_id)
 {
 	int i;
 
-	for (i = 0; nand_flash_ids[i].id; i++) {
+	for (i = 0; nand_flash_ids[i].name != NULL; i++) {
 		if (nand_flash_ids[i].dev_id == dev_id)
 			return &nand_flash_ids[i];
 	}
@@ -2849,7 +2849,7 @@ qpic_nand_read_page(struct mtd_info *mtd, uint32_t page,
 	uint32_t i;
 	int nand_ret = NANDC_RESULT_SUCCESS;
 	uint8_t flags = 0;
-	uint32_t *cmd_list_temp = NULL;
+	struct cmd_element *cmd_list_temp = NULL;
 	uint16_t data_bytes;
 	uint16_t ud_bytes_in_last_cw;
 	uint16_t oob_bytes;
@@ -3026,7 +3026,7 @@ qpic_nand_read_page(struct mtd_info *mtd, uint32_t page,
 				   (uint32_t)((addr_t)&(stats[i].flash_sts)),
 				   CE_READ_TYPE);
 
-		cmd_list_temp = (uint32_t *)cmd_list_ptr;
+		cmd_list_temp = cmd_list_ptr;
 
 		cmd_list_ptr++;