diff --git a/src/apply.c b/src/apply.c
index 55dc7aed1..7829bacc8 100644
--- a/src/apply.c
+++ b/src/apply.c
@@ -3166,7 +3166,7 @@ find_poleable_mon(coord *pos, int min_range, int max_range)
                 && (mtmp->mtame || (mtmp->mpeaceful && flags.confirm)))
                 continue;
             if (glyph_is_poleable(glyph)
-                    && (!glyph_is_statue(glyph) || impaired)) {
+                && (!glyph_is_statue(glyph) || impaired)) {
                 if (mpos.x)
                     return FALSE; /* more than one candidate location */
                 mpos.x = x, mpos.y = y;
diff --git a/src/mhitu.c b/src/mhitu.c
index 06daf1cc9..cd9183506 100644
--- a/src/mhitu.c
+++ b/src/mhitu.c
@@ -653,7 +653,7 @@ mattacku(register struct monst *mtmp)
         if (i > 0 && foundyou /* previous attack might have moved hero */
             && (mtmp->mux != u.ux || mtmp->muy != u.uy))
             continue; /* fill in sum[] with 'miss' but skip other actions */
-        mon_currwep = (struct obj *)0;
+        mon_currwep = (struct obj *) 0;
         mattk = getmattk(mtmp, &g.youmonst, i, sum, &alt_attk);
         if ((u.uswallow && mattk->aatyp != AT_ENGL)
             || (skipnonmagc && mattk->aatyp != AT_MAGC)
diff --git a/src/mon.c b/src/mon.c
index 0ba0da2d0..3d67227b1 100644
--- a/src/mon.c
+++ b/src/mon.c
@@ -1884,7 +1884,9 @@ mfndpos(
                         && (dmgtype(mdat, AD_RUST)
                             || dmgtype(mdat, AD_CORR)))))
                 continue;
-            if (IS_DOOR(ntyp) && !(amorphous(mdat) || can_fog(mon))
+            if (IS_DOOR(ntyp)
+                && !((amorphous(mdat) || can_fog(mon))
+                     && !(u.uswallow && mon == u.ustuck))
                 && (((levl[nx][ny].doormask & D_CLOSED) && !(flag & OPENDOOR))
                     || ((levl[nx][ny].doormask & D_LOCKED)
                         && !(flag & UNLOCKDOOR))) && !thrudoor)