diff --git a/src/dungeon.c b/src/dungeon.c
index 0e483a11d..27b748104 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -2409,8 +2409,7 @@ recalc_mapseen()
     struct monst *mtmp;
     struct cemetery *bp, **bonesaddr;
     unsigned i, ridx;
-    int x, y, ltyp, count;
-    unsigned int atmp;
+    int x, y, ltyp, count, atmp;
 
     /* Should not happen in general, but possible if in the process
      * of being booted from the quest.  The mapseen object gets
diff --git a/src/sp_lev.c b/src/sp_lev.c
index b2206ae70..dbab1dfdc 100644
--- a/src/sp_lev.c
+++ b/src/sp_lev.c
@@ -3763,7 +3763,7 @@ struct opvar *mc;
 {
     int x, y;
     schar mapc;
-    uchar lit;
+    xchar lit;
     struct opvar *ret = selection_opvar((char *) 0);
 
     if (!ov || !mc || !ret)