diff --git a/mmc_cmds.c b/mmc_cmds.c
index 92a01d6..6229292 100644
--- a/mmc_cmds.c
+++ b/mmc_cmds.c
@@ -1168,7 +1168,7 @@
 
 	enh_size_mult = (length_kib + align/2l) / align;
 
-	enh_start_addr = start_kib * 1024 / (is_blockaddresed(ext_csd) ? 512 : 1);
+	enh_start_addr = start_kib * (1024 / (is_blockaddresed(ext_csd) ? 512 : 1));
 	enh_start_addr /= align;
 	enh_start_addr *= align;
 
@@ -1766,9 +1766,9 @@
 			(ext_csd[EXT_CSD_ENH_START_ADDR_1] << 8) |
 			ext_csd[EXT_CSD_ENH_START_ADDR_0];
 		printf("Enhanced User Data Start Address"
-			" [ENH_START_ADDR]: 0x%06x\n", regl);
-		printf(" i.e. %lu bytes offset\n", (is_blockaddresed(ext_csd) ?
-				512l : 1l) * regl);
+			" [ENH_START_ADDR]: 0x%08x\n", regl);
+		printf(" i.e. %llu bytes offset\n", (is_blockaddresed(ext_csd) ?
+				512ll : 1ll) * regl);
 
 		/* A441]: reserved [135] */
 		printf("Bad Block Management mode"