diff --git a/crypto_sign/falcon-1024/clean/fpr.c b/crypto_sign/falcon-1024/clean/fpr.c
index 636b4092..ff3eda4a 100644
--- a/crypto_sign/falcon-1024/clean/fpr.c
+++ b/crypto_sign/falcon-1024/clean/fpr.c
@@ -538,7 +538,7 @@ fpr_expm_p63(fpr x, fpr ccs) {
     };
 
     uint64_t z, y;
-    unsigned u;
+    size_t u;
     uint32_t z0, z1, y0, y1;
     uint64_t a, b;
 
diff --git a/crypto_sign/falcon-1024/clean/keygen.c b/crypto_sign/falcon-1024/clean/keygen.c
index 47081537..a7246b78 100644
--- a/crypto_sign/falcon-1024/clean/keygen.c
+++ b/crypto_sign/falcon-1024/clean/keygen.c
@@ -2275,8 +2275,8 @@ mkgauss(RNG_CONTEXT *rng, unsigned logn) {
         v = 0;
         r = get_rng_u64(rng);
         r &= ~((uint64_t)1 << 63);
-        for (k = 1; k < (sizeof gauss_1024_12289)
-                / (sizeof gauss_1024_12289[0]); k ++) {
+        for (k = 1; k < (uint32_t)((sizeof gauss_1024_12289)
+                                   / (sizeof gauss_1024_12289[0])); k ++) {
             uint32_t t;
 
             t = (uint32_t)((r - gauss_1024_12289[k]) >> 63) ^ 1;
diff --git a/crypto_sign/falcon-512/clean/fpr.c b/crypto_sign/falcon-512/clean/fpr.c
index 636b4092..ff3eda4a 100644
--- a/crypto_sign/falcon-512/clean/fpr.c
+++ b/crypto_sign/falcon-512/clean/fpr.c
@@ -538,7 +538,7 @@ fpr_expm_p63(fpr x, fpr ccs) {
     };
 
     uint64_t z, y;
-    unsigned u;
+    size_t u;
     uint32_t z0, z1, y0, y1;
     uint64_t a, b;
 
diff --git a/crypto_sign/falcon-512/clean/keygen.c b/crypto_sign/falcon-512/clean/keygen.c
index b8f0dac1..8ee73151 100644
--- a/crypto_sign/falcon-512/clean/keygen.c
+++ b/crypto_sign/falcon-512/clean/keygen.c
@@ -2275,8 +2275,8 @@ mkgauss(RNG_CONTEXT *rng, unsigned logn) {
         v = 0;
         r = get_rng_u64(rng);
         r &= ~((uint64_t)1 << 63);
-        for (k = 1; k < (sizeof gauss_1024_12289)
-                / (sizeof gauss_1024_12289[0]); k ++) {
+        for (k = 1; k < (uint32_t)((sizeof gauss_1024_12289)
+                                   / (sizeof gauss_1024_12289[0])); k ++) {
             uint32_t t;
 
             t = (uint32_t)((r - gauss_1024_12289[k]) >> 63) ^ 1;