diff --git a/data/scenarios/Challenges/Ranching/beekeeping.yaml b/data/scenarios/Challenges/Ranching/beekeeping.yaml
index 4872dc067..4625126ce 100644
--- a/data/scenarios/Challenges/Ranching/beekeeping.yaml
+++ b/data/scenarios/Challenges/Ranching/beekeeping.yaml
@@ -430,7 +430,7 @@ world:
     in
       overlay
       [ {grass}
-      , mask (flowers && (x + y) % 3 == 0) {wildflower}
+      , mask (flowers && (x - y) % 3 == 0) {wildflower}
       , mask (rubble && (x + y) % 2 == 0) {rock}
       , mask rock {rock}
       , mask trees {tree}
diff --git a/data/scenarios/Challenges/gallery.yaml b/data/scenarios/Challenges/gallery.yaml
index 5dffa219c..69d8cf7c9 100644
--- a/data/scenarios/Challenges/gallery.yaml
+++ b/data/scenarios/Challenges/gallery.yaml
@@ -241,8 +241,8 @@ world:
   dsl: |
     overlay
     [ {terrain: stone}
-    , if (x/5 + y/5) % 2 == 0 then {terrain: dirt} else {blank}
-    , if (((x + 3) % 20)/11 + ((y + 3) % 20)/11) == 0 then {terrain: grass} else {blank}
+    , if (x/5 + (-y)/5) % 2 == 0 then {terrain: dirt} else {blank}
+    , if (((3 - y) % 20)/11 + ((x + 3) % 20)/11) == 0 then {terrain: grass} else {blank}
     ]
   upperleft: [0, 11]
   offset: false
diff --git a/data/scenarios/Challenges/wave.yaml b/data/scenarios/Challenges/wave.yaml
index 6c183db31..70693a0b9 100644
--- a/data/scenarios/Challenges/wave.yaml
+++ b/data/scenarios/Challenges/wave.yaml
@@ -68,7 +68,7 @@ world:
   dsl: |
     overlay
     [ {dirt, water}
-    , if (x + y / 2) % 5 == 0 then {dirt, wavy water} else {blank}
+    , if (x / 2 - y) % 5 == 0 then {dirt, wavy water} else {blank}
     ]
   upperleft: [-3, 6]
   offset: false
diff --git a/data/scenarios/Fun/horton.yaml b/data/scenarios/Fun/horton.yaml
index 24987c3ad..027ae5a65 100644
--- a/data/scenarios/Fun/horton.yaml
+++ b/data/scenarios/Fun/horton.yaml
@@ -76,7 +76,7 @@ world:
       [ {dirt}
       , mask (patch) {boulder}
       , mask (prize) {flower}
-      , mask (y < -80 || y > 80 || x < -60 || x > 60) (overlay [{water}])
+      , mask (x < -80 || x > 80 || y < -60 || y > 60) (overlay [{water}])
       ]
   upperleft: [-4, 4]
   offset: false
diff --git a/data/scenarios/Testing/1535-ping/1535-in-range.yaml b/data/scenarios/Testing/1535-ping/1535-in-range.yaml
index 37bbb7acd..f42462d05 100644
--- a/data/scenarios/Testing/1535-ping/1535-in-range.yaml
+++ b/data/scenarios/Testing/1535-ping/1535-in-range.yaml
@@ -75,8 +75,8 @@ world:
   dsl: |
     overlay
     [ {terrain: stone}
-    , if (x/5 + y/5) % 2 == 0 then {terrain: dirt} else {blank}
-    , if ((x + 3) % 19)/12 + (y % 19)/12 == 0 then {terrain: grass} else {blank}
+    , if (x/5 + (-y)/5) % 2 == 0 then {terrain: dirt} else {blank}
+    , if ((3 - y) % 19)/12 + (x % 19)/12 == 0 then {terrain: grass} else {blank}
     ]
   palette:
     'B': [blank, null, base]
diff --git a/data/scenarios/Testing/1535-ping/1535-out-of-range.yaml b/data/scenarios/Testing/1535-ping/1535-out-of-range.yaml
index fed61705d..96352c712 100644
--- a/data/scenarios/Testing/1535-ping/1535-out-of-range.yaml
+++ b/data/scenarios/Testing/1535-ping/1535-out-of-range.yaml
@@ -54,8 +54,8 @@ world:
   dsl: |
     overlay
     [ {terrain: blank}
-    , if (x/4 + y/4) % 2 == 0 then {terrain: dirt} else {blank}
-    , if ((x + 3) % 19)/12 + (y % 19)/12 == 0 then {terrain: grass} else {blank}
+    , if (x/4 + (-y)/4) % 2 == 0 then {terrain: dirt} else {blank}
+    , if ((3 - y) % 19)/12 + (x % 19)/12 == 0 then {terrain: grass} else {blank}
     ]
   palette:
     'B': [stone, null, base]