3 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/defines.h b/crawl-ref/source/defines.h
index f4a55736ef..cca786c9d0 100644
--- a/crawl-ref/source/defines.h
+++ b/crawl-ref/source/defines.h
@@ -68,7 +68,7 @@
 #define MAX_CLOUDS 180
 
 // empty cloud -- (CLOUDS + 1) {dlb}:
-#define EMPTY_CLOUD 101
+#define EMPTY_CLOUD (MAX_CLOUDS + 1)
 
 // max x-bound for level generation {dlb}
 #define GXM 80
diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc
index b260f14dc7..1f745b1a78 100644
--- a/crawl-ref/source/direct.cc
+++ b/crawl-ref/source/direct.cc
@@ -1554,8 +1554,7 @@ static void describe_cell(int mx, int my)
 #endif
     if (env.cgrid[mx][my] != EMPTY_CLOUD)
     {
-        const char cloud_inspected = env.cgrid[mx][my];
-
+        const int cloud_inspected = env.cgrid[mx][my];
         const cloud_type ctype = (cloud_type) env.cloud[cloud_inspected].type;
 
         mprf("There is a cloud of %s here.", cloud_name(ctype).c_str());
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index deebe42670..b7d6d79fd5 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -1529,7 +1529,7 @@ static void tag_read_level( struct tagHeader &th, char minorVersion )
             env.map_col[i][j].flags  = unmarshallShort(th);
 
             mgrd[i][j] = NON_MONSTER;
-            env.cgrid[i][j] = unmarshallByte(th);
+            env.cgrid[i][j] = (unsigned char) unmarshallByte(th);
         }
     }