diff --git a/doc/fixes36.2 b/doc/fixes36.2
index 141c13584..f4130f94d 100644
--- a/doc/fixes36.2
+++ b/doc/fixes36.2
@@ -342,6 +342,7 @@ the simulation of dual weapon combat when polymorphed into a form with more
 	used seconary weapon even when wearing a shield, or if it was silver
 	even when current shape couldn't handle silver, or if it was cursed;
 	cursed is allowed but weapon will be dropped, just like in two-weapon
+demons gated in other demons without any message
 
 
 Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository
diff --git a/src/minion.c b/src/minion.c
index f785fa78d..de6018a8d 100644
--- a/src/minion.c
+++ b/src/minion.c
@@ -143,6 +143,8 @@ struct monst *mon;
                 EMIN(mtmp)->renegade =
                     (atyp != u.ualign.type) ^ !mtmp->mpeaceful;
             }
+            if (is_demon(ptr) && canseemon(mtmp))
+                pline("%s appears in a cloud of smoke!", Amonnam(mtmp));
         }
         cnt--;
     }
diff --git a/src/save.c b/src/save.c
index 873ce91a5..83f21dc4d 100644
--- a/src/save.c
+++ b/src/save.c
@@ -1236,6 +1236,8 @@ int fd, mode;
         while ((msg = getmsghistory(init)) != 0) {
             init = FALSE;
             msglen = strlen(msg);
+            if (msglen < 1)
+                continue;
             /* sanity: truncate if necessary (shouldn't happen);
                no need to modify msg[] since terminator isn't written */
             if (msglen > BUFSZ - 1)
diff --git a/sys/winnt/windmain.c b/sys/winnt/windmain.c
index 8055dd642..b29c106e8 100644
--- a/sys/winnt/windmain.c
+++ b/sys/winnt/windmain.c
@@ -32,8 +32,8 @@ E void NDECL(mswin_destroy_reg);
 #endif
 #ifdef TTY_GRAPHICS
 extern void NDECL(backsp);
-extern void NDECL(clear_screen);
 #endif
+extern void NDECL(clear_screen);
 #undef E
 
 #ifdef PC_LOCKING