diff --git a/gm4_mysterious_midnights/beet.yaml b/gm4_mysterious_midnights/beet.yaml
index a894d73d35..27ab5d6049 100644
--- a/gm4_mysterious_midnights/beet.yaml
+++ b/gm4_mysterious_midnights/beet.yaml
@@ -9,6 +9,9 @@ pipeline:
   - gm4.plugins.extend.module
   - gm4.plugins.include.lib_forceload
 
+require:
+  - bolt
+
 meta:
   gm4:
     versioning:
diff --git a/gm4_mysterious_midnights/data/gm4_mysterious_midnights/function/calculate_difficulty.mcfunction b/gm4_mysterious_midnights/data/gm4_mysterious_midnights/function/calculate_difficulty.mcfunction
index 1753765156..dc564d9602 100644
--- a/gm4_mysterious_midnights/data/gm4_mysterious_midnights/function/calculate_difficulty.mcfunction
+++ b/gm4_mysterious_midnights/data/gm4_mysterious_midnights/function/calculate_difficulty.mcfunction
@@ -2,8 +2,9 @@
 # at 29999998 1 7134 (forceloaded chunk)
 # run from gm4_mysterious_midnights:start_midnight
 
+# TODO: remove raw and bolt require later
 # generate random number from 0 to 15
-execute store result storage gm4_mysterious_midnights:temp day int 1 run time query day
+raw execute store result storage gm4_mysterious_midnights:temp day int 1 run time query day repetition
 function gm4_mysterious_midnights:roll_difficulty with storage gm4_mysterious_midnights:temp
 scoreboard players set 16 gm4_mm_data 16
 scoreboard players operation difficulty gm4_mm_data %= 16 gm4_mm_data
diff --git a/gm4_survival_refightalized/beet.yaml b/gm4_survival_refightalized/beet.yaml
index 6f58c33eda..9f5833ad75 100644
--- a/gm4_survival_refightalized/beet.yaml
+++ b/gm4_survival_refightalized/beet.yaml
@@ -8,6 +8,9 @@ data_pack:
 resource_pack:
   load: .
 
+require:
+  - bolt
+
 pipeline:
   - gm4.plugins.extend.module
   - gm4.plugins.include.lib_forceload
diff --git a/gm4_survival_refightalized/data/gm4_survival_refightalized/function/slow_clock.mcfunction b/gm4_survival_refightalized/data/gm4_survival_refightalized/function/slow_clock.mcfunction
index 009ab13e56..433cfcae52 100644
--- a/gm4_survival_refightalized/data/gm4_survival_refightalized/function/slow_clock.mcfunction
+++ b/gm4_survival_refightalized/data/gm4_survival_refightalized/function/slow_clock.mcfunction
@@ -1,7 +1,8 @@
 schedule function gm4_survival_refightalized:slow_clock 30s
 
+# TODO: remove raw and bolt require later
 # get moon cycle (0 = new moon, 4 = full moon)
-execute store result score $moon gm4_sr_data run time query day
+raw execute store result score $moon gm4_sr_data run time query day repetition
 scoreboard players operation $moon gm4_sr_data %= #8 gm4_sr_data
 scoreboard players set $8 gm4_sr_data 8
 execute if score $moon gm4_sr_data matches ..3 store result score $moon gm4_sr_data run scoreboard players operation $8 gm4_sr_data -= $moon gm4_sr_data