diff --git a/cube.c b/cube.c
index 69a9d35..3b4e975 100644
--- a/cube.c
+++ b/cube.c
@@ -202,8 +202,8 @@ struct game_grid {
 };
 
 #define SET_SQUARE(state, i, val) \
-    ((state)->bluemask[(i)/32] &= ~(1 << ((i)%32)), \
-     (state)->bluemask[(i)/32] |= ((!!val) << ((i)%32)))
+    ((state)->bluemask[(i)/32] &= ~(1UL << ((i)%32)), \
+     (state)->bluemask[(i)/32] |= ((unsigned long)(!!val) << ((i)%32)))
 #define GET_SQUARE(state, i) \
     (((state)->bluemask[(i)/32] >> ((i)%32)) & 1)
 
diff --git a/random.c b/random.c
index 5527d6f..bd11f16 100644
--- a/random.c
+++ b/random.c
@@ -254,12 +254,12 @@ unsigned long random_bits(random_state *state, int bits)
     }
 
     /*
-     * `(1 << bits) - 1' is not good enough, since if bits==32 on a
+     * `(1UL << bits) - 1' is not good enough, since if bits==32 on a
      * 32-bit machine, behaviour is undefined and Intel has a nasty
      * habit of shifting left by zero instead. We'll shift by
      * bits-1 and then separately shift by one.
      */
-    ret &= (1 << (bits-1)) * 2 - 1;
+    ret &= (1UL << (bits-1)) * 2 - 1;
     return ret;
 }