diff --git a/cmdline/elem.c b/cmdline/elem.c
index d260e001..3535c39a 100644
--- a/cmdline/elem.c
+++ b/cmdline/elem.c
@@ -1578,13 +1578,13 @@ const char* fmt_term(const struct snapraid_disk* disk, const char* str)
 
 const char* fmt_size(uint64_t size, char* buffer, size_t buffer_size)
 {
-	if (size >= 10UL * TERA)
+	if (size >= 10ULL * TERA)
 		snprintf(buffer, buffer_size, "%" PRIu64 " T", size / TERA);
-	else if (size >= 10UL * GIGA)
+	else if (size >= 10ULL * GIGA)
 		snprintf(buffer, buffer_size, "%" PRIu64 " G", size / GIGA);
-	else if (size >= 10UL * MEGA)
+	else if (size >= 10 * MEGA)
 		snprintf(buffer, buffer_size, "%" PRIu64 " M", size / MEGA);
-	else if (size >= 10UL * KILO)
+	else if (size >= 10 * KILO)
 		snprintf(buffer, buffer_size, "%" PRIu64 " k", size / KILO);
 	else
 		snprintf(buffer, buffer_size, "%" PRIu64 " ", size);
diff --git a/cmdline/state.h b/cmdline/state.h
index ebe80ced..67679cee 100644
--- a/cmdline/state.h
+++ b/cmdline/state.h
@@ -36,11 +36,11 @@ const char* lev_config_name(unsigned level);
 #define KILO (1000)
 #define MEGA (1000 * 1000)
 #define GIGA (1000 * 1000 * 1000)
-#define TERA (1000 * 1000 * 1000 * 1000UL)
+#define TERA (1000 * 1000 * 1000 * (uint64_t)1000)
 #define KIBI (1024)
 #define MEBI (1024 * 1024)
 #define GIBI (1024 * 1024 * 1024)
-#define TEBI (1024 * 1024 * 1024 * 1024UL)
+#define TEBI (1024 * 1024 * 1024 * (uint64_t)1024)
 
 #define SORT_PHYSICAL 1 /**< Sort by physical order. */
 #define SORT_INODE 2 /**< Sort by inode. */