diff --git a/crypto_kem/newhope1024cca/clean/reduce.c b/crypto_kem/newhope1024cca/clean/reduce.c
index a024f7ea..e96b25e5 100644
--- a/crypto_kem/newhope1024cca/clean/reduce.c
+++ b/crypto_kem/newhope1024cca/clean/reduce.c
@@ -5,7 +5,7 @@ static const uint32_t qinv = 12287; // -inverse_mod(p,2^18)
 static const uint32_t rlog = 18;
 
 /*************************************************
-* Name:        verify
+* Name:        montgomery_reduce
 *
 * Description: Montgomery reduction; given a 32-bit integer a, computes
 *              16-bit integer congruent to a * R^-1 mod q,
diff --git a/crypto_kem/newhope1024cca/clean/verify.c b/crypto_kem/newhope1024cca/clean/verify.c
index 0cb31049..f68c9328 100644
--- a/crypto_kem/newhope1024cca/clean/verify.c
+++ b/crypto_kem/newhope1024cca/clean/verify.c
@@ -22,7 +22,7 @@ int PQCLEAN_NEWHOPE1024CCA_CLEAN_verify(const unsigned char *a, const unsigned c
         r |= a[i] ^ b[i];
     }
 
-    r = (-(int64_t)r) >> 63;
+    r = (uint64_t)(-(int64_t)r) >> 63;
     return (int)r;
 }
 
diff --git a/crypto_kem/newhope1024cpa/clean/reduce.c b/crypto_kem/newhope1024cpa/clean/reduce.c
index f975bf92..49421e3d 100644
--- a/crypto_kem/newhope1024cpa/clean/reduce.c
+++ b/crypto_kem/newhope1024cpa/clean/reduce.c
@@ -5,7 +5,7 @@ static const uint32_t qinv = 12287; // -inverse_mod(p,2^18)
 static const uint32_t rlog = 18;
 
 /*************************************************
-* Name:        verify
+* Name:        montgomery_reduce
 *
 * Description: Montgomery reduction; given a 32-bit integer a, computes
 *              16-bit integer congruent to a * R^-1 mod q,
diff --git a/crypto_kem/newhope1024cpa/clean/verify.c b/crypto_kem/newhope1024cpa/clean/verify.c
index 53276b93..677e3ae9 100644
--- a/crypto_kem/newhope1024cpa/clean/verify.c
+++ b/crypto_kem/newhope1024cpa/clean/verify.c
@@ -22,7 +22,7 @@ int PQCLEAN_NEWHOPE1024CPA_CLEAN_verify(const unsigned char *a, const unsigned c
         r |= a[i] ^ b[i];
     }
 
-    r = (-(int64_t)r) >> 63;
+    r = (uint64_t)(-(int64_t)r) >> 63;
     return (int)r;
 }
 
diff --git a/crypto_kem/newhope512cca/clean/reduce.c b/crypto_kem/newhope512cca/clean/reduce.c
index cdaffba7..c3d7f97e 100644
--- a/crypto_kem/newhope512cca/clean/reduce.c
+++ b/crypto_kem/newhope512cca/clean/reduce.c
@@ -5,7 +5,7 @@ static const uint32_t qinv = 12287; // -inverse_mod(p,2^18)
 static const uint32_t rlog = 18;
 
 /*************************************************
-* Name:        verify
+* Name:        montgomery_reduce
 *
 * Description: Montgomery reduction; given a 32-bit integer a, computes
 *              16-bit integer congruent to a * R^-1 mod q,
diff --git a/crypto_kem/newhope512cca/clean/verify.c b/crypto_kem/newhope512cca/clean/verify.c
index 553c0e50..37e65f94 100644
--- a/crypto_kem/newhope512cca/clean/verify.c
+++ b/crypto_kem/newhope512cca/clean/verify.c
@@ -22,7 +22,7 @@ int PQCLEAN_NEWHOPE512CCA_CLEAN_verify(const unsigned char *a, const unsigned ch
         r |= a[i] ^ b[i];
     }
 
-    r = (-(int64_t)r) >> 63;
+    r = (uint64_t)(-(int64_t)r) >> 63;
     return (int)r;
 }
 
diff --git a/crypto_kem/newhope512cpa/clean/reduce.c b/crypto_kem/newhope512cpa/clean/reduce.c
index 75d23570..c7adf562 100644
--- a/crypto_kem/newhope512cpa/clean/reduce.c
+++ b/crypto_kem/newhope512cpa/clean/reduce.c
@@ -5,7 +5,7 @@ static const uint32_t qinv = 12287; // -inverse_mod(p,2^18)
 static const uint32_t rlog = 18;
 
 /*************************************************
-* Name:        verify
+* Name:        montgomery_reduce
 *
 * Description: Montgomery reduction; given a 32-bit integer a, computes
 *              16-bit integer congruent to a * R^-1 mod q,
diff --git a/crypto_kem/newhope512cpa/clean/verify.c b/crypto_kem/newhope512cpa/clean/verify.c
index 449bc219..a03cf862 100644
--- a/crypto_kem/newhope512cpa/clean/verify.c
+++ b/crypto_kem/newhope512cpa/clean/verify.c
@@ -22,7 +22,7 @@ int PQCLEAN_NEWHOPE512CPA_CLEAN_verify(const unsigned char *a, const unsigned ch
         r |= a[i] ^ b[i];
     }
 
-    r = (-(int64_t)r) >> 63;
+    r = (uint64_t)(-(int64_t)r) >> 63;
     return (int)r;
 }