diff --git a/fit_image.c b/fit_image.c
index 899e868..fcf32f1 100644
--- a/fit_image.c
+++ b/fit_image.c
@@ -77,13 +77,13 @@ static int fit_parse_arch(const char *value)
 
 static uint32_t fdt_getprop_u32(const void *fdt, int node, const char *name)
 {
-	const struct fdt_property *prop;
+	const fdt32_t *val;
 
-	prop = fdt_get_property(fdt, node, name, NULL);
-	if (!prop)
+	val = fdt_getprop(fdt, node, name, NULL);
+	if (!val)
 		return ~0U;
 
-	return be32toh(*(uint32_t *)prop->data);
+	return fdt32_to_cpu(*val);
 }
 
 static const char *fdt_getprop_str(const void *fdt, int node, const char *name)
diff --git a/nand-part.c b/nand-part.c
index a0d46c5..af2169d 100644
--- a/nand-part.c
+++ b/nand-part.c
@@ -90,7 +90,7 @@ static MBR *_get_mbr(int fd, int mbr_num, int force)
 		printf("check partition table copy %d: ", mbr_num);
 		printmbrheader(mbr);
 		if (force) {
-			strncpy((char *)mbr->magic, MBR_MAGIC, 8);
+			memcpy(mbr->magic, MBR_MAGIC, 8);
 			mbr->version = MBR_VERSION;
 			return mbr;
 		}