diff --git a/landgen.cpp b/landgen.cpp
index 705a2df9..88200fc9 100644
--- a/landgen.cpp
+++ b/landgen.cpp
@@ -2084,11 +2084,11 @@ void giantLandSwitch(cell *c, int d, cell *from) {
       ONEMPTY {
         if(nonbitrunc && c->land == laCrossroads5 && hrand(100) < 60)
           c->wall = waBarrier;
-        else if(!ctof(c) && !inv::on && items[itShard] >= 10 && hrand(8000) < 120*orbcrossfun(items[itShard]))
+        else if(!ctof(c) && !inv::on && items[itShard] >= 10 && hrand(8000) < 120*orbcrossfun(items[itShard]) && !whirl::whirl)
           c->wall = hrand(2) ? waMirror : waCloud;
-        else if(!ctof(c) && hyperstonesUnlocked() && hrand(8000) < 100)
+        else if(!ctof(c) && hyperstonesUnlocked() && hrand(8000) < 100 && !whirl::whirl)
           c->wall = hrand(2) ? waMirror : waCloud;
-        else if(!ctof(c) && tactic::on && isCrossroads(tactic::lasttactic) && hrand(8000) < 120)
+        else if(!ctof(c) && tactic::on && isCrossroads(tactic::lasttactic) && hrand(8000) < 120 && !whirl::whirl)
           c->wall = hrand(2) ? waMirror : waCloud;
         else if(c->land == laCrossroads4 && hrand(24000) < 10 && tactic::on)
           c->wall = waRose;
diff --git a/orbgen.cpp b/orbgen.cpp
index 3ec83d2e..fe78bdbe 100644
--- a/orbgen.cpp
+++ b/orbgen.cpp
@@ -381,6 +381,7 @@ ld orbcrossfun(int tr) {
 
 bool buildPrizeMirror(cell *c, int freq) {
   if(inv::on) return false;
+  if(whirl::whirl) return false;
   if(c->type == 7 && !nonbitrunc) return false;
   if(items[itShard] < 25) return false;
   if(freq && hrand(freq * 100 / orbprizefun(items[itShard])) >= 100)
diff --git a/pattern2.cpp b/pattern2.cpp
index f706b104..b5633c81 100644
--- a/pattern2.cpp
+++ b/pattern2.cpp
@@ -155,6 +155,7 @@ int fiftyval049(cell *c) {
     // printf("%d,%d: %d\n", allcodes[0], allcodes[1], allcodes[0] + 7);
     return allcodes[0] + 7;
     }
+  else if(whirl::whirl) return fiftyval049(c->master->c7);
   else if(sphere) return 0;
   else {
     int a[3], qa=0;