diff --git a/misc.c b/misc.c
index 5ad4d0b..91778d8 100644
--- a/misc.c
+++ b/misc.c
@@ -194,7 +194,7 @@ void game_mkhighlight(frontend *fe, float *ret,
     }
 }
 
-void memswap(void *av, void *bv, int size)
+static void memswap(void *av, void *bv, int size)
 {
     char tmpbuf[512];
     char *a = av, *b = bv;
diff --git a/untangle.c b/untangle.c
index 9fc786b..5d01e9a 100644
--- a/untangle.c
+++ b/untangle.c
@@ -284,7 +284,7 @@ static unsigned long squarert(unsigned long n) {
 
     d = n;
     a = 0;
-    b = 1 << 30;		       /* largest available power of 4 */
+    b = 1L << 30;		       /* largest available power of 4 */
     do {
         a >>= 1;
         di = 2*a + b;