diff --git a/client/reveng/model.c b/client/reveng/model.c
index ba5e84f07..16a791312 100644
--- a/client/reveng/model.c
+++ b/client/reveng/model.c
@@ -113,8 +113,8 @@ char *mtostr(const model_t *model) {
         + strlen(strbuf)
         + (polystr && *polystr ? strlen(polystr) : 6)
         + (initstr && *initstr ? strlen(initstr) : 6)
-        + (model->flags & P_REFIN ? 4 : 5)
-        + (model->flags & P_REFOUT ? 4 : 5)
+        + ((model->flags & P_REFIN) ? 4 : 5)
+        + ((model->flags & P_REFOUT) ? 4 : 5)
         + (xorotstr && *xorotstr ? strlen(xorotstr) : 6)
         + (checkstr && *checkstr ? strlen(checkstr) : 6)
         + (magicstr && *magicstr ? strlen(magicstr) : 6)
diff --git a/client/reveng/poly.c b/client/reveng/poly.c
index 1a2ca958f..7e35be18c 100644
--- a/client/reveng/poly.c
+++ b/client/reveng/poly.c
@@ -1207,7 +1207,7 @@ prhex(char **spp, bmp_t bits, int flags, int bperhx) {
      * Set P_UPPER in flags to write A-F in uppercase.
      */
     static const char hex[] = "0123456789abcdef0123456789ABCDEF";
-    const int upper = (flags & P_UPPER ? 0x10 : 0);
+    const int upper = ((flags & P_UPPER) ? 0x10 : 0);
     while (bperhx > 0) {
         bperhx -= ((bperhx + 3) & 3) + 1;
         *(*spp)++ = hex[(bits >> bperhx & BMP_C(0xf)) | upper];