3 files changed, 11 insertions, 15 deletions
diff --git a/crawl-ref/source/dat/shoals.des b/crawl-ref/source/dat/shoals.des
index 2b52eb6ade..e924b792f3 100644
--- a/crawl-ref/source/dat/shoals.des
+++ b/crawl-ref/source/dat/shoals.des
@@ -244,11 +244,11 @@ SUBST:     A:x, B:x, C:x=, D=+
 LROCKTILE:  wall_vines
 MAP
  xxCxx
-xx...xx
-x.....x
-B..O..D
-x.....x
-xx...xx
+xx.1.xx
+x.1.1.x
+B1.O.1D
+x.1.1.x
+xx.1.xx
  xxAxx
 ENDMAP
 
@@ -263,10 +263,10 @@ SHUFFLE: ABCD
 SUBST:   A:x, B:x, C:x=, D=+
 MAP
  xxCxx
-xx...xx
-x.....x
-B..|..D
-x.....x
-xx...xx
+xx.1.xx
+x.1.1.x
+B1.|.1D
+x.1.1.x
+xx.1.xx
  xxAxx
 ENDMAP
diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc
index 091650e0a0..7692517c68 100644
--- a/crawl-ref/source/mon-pick.cc
+++ b/crawl-ref/source/mon-pick.cc
@@ -1699,7 +1699,6 @@ int mons_shoals_level(int mcls)
     switch (mcls)
     {
     case MONS_BUTTERFLY:
-    case MONS_PLANT:
     case MONS_GIANT_BAT:
         break;
 
@@ -1746,9 +1745,6 @@ int mons_shoals_rare(int mcls)
 {
     switch (mcls)
     {
-    case MONS_PLANT:
-        return 150;
-
     case MONS_MERFOLK:
         return 50;
 
diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc
index 63d6524a4c..dc5c47ba00 100644
--- a/crawl-ref/source/mon-place.cc
+++ b/crawl-ref/source/mon-place.cc
@@ -770,7 +770,7 @@ int place_monster(mgen_data mg, bool force_pos)
                                    mg.pos, mg.map_mask,
                                    &stair_type, &mg.power);
 
-    if (mg.cls == MONS_NO_MONSTER)
+    if (mg.cls == MONS_NO_MONSTER || mg.cls == MONS_PROGRAM_BUG)
         return (-1);
 
     // (3) Decide on banding (good lord!)