diff --git a/gradle.properties b/gradle.properties
index 37570651..edb6a842 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,10 +5,9 @@ junit_version=5.10.0-M1
 mixinextras_version=0.3.2
 
 mod_id=modernfix
-minecraft_version=1.21-pre4
+minecraft_version=1.21
 enabled_platforms=fabric,neoforge
-forge_version=21.0.0-alpha.1.21-pre4.20240609.000029
-neoforge_pr=1076
+forge_version=21.0.0-beta
 # parchment_version=2023.07.09
 refined_storage_version=4392788
 jei_version=16.0.0.28
@@ -16,7 +15,7 @@ rei_version=13.0.678
 ctm_version=1.20.1-1.1.8+4
 kubejs_version=1902.6.0-build.142
 rhino_version=1902.2.2-build.268
-supported_minecraft_versions=1.21-pre4
+supported_minecraft_versions=1.21
 
 fabric_loader_version=0.15.11
 fabric_api_version=0.100.0+1.21
diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java
index e6aee278..7141019b 100644
--- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java
+++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java
@@ -14,6 +14,7 @@ import net.neoforged.fml.*;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.config.ModConfig;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.neoforged.fml.loading.FMLEnvironment;
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
@@ -41,7 +42,9 @@ public class ModernFixForge {
         NeoForge.EVENT_BUS.register(this);
         modBus.addListener(this::commonSetup);
         modBus.addListener(this::registerItems);
-        DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> NeoForge.EVENT_BUS.register(new ModernFixClientForge(modContainer, modBus)));
+        if(FMLEnvironment.dist == Dist.CLIENT) {
+            NeoForge.EVENT_BUS.register(new ModernFixClientForge(modContainer, modBus));
+        }
         modContainer.registerConfig(ModConfig.Type.COMMON, ModernFixConfig.COMMON_CONFIG);
         ModFileScanDataDeduplicator.deduplicate();
         ClassLoadHack.loadModClasses();
diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java b/neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java
index 061b8169..4a030ec2 100644
--- a/neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java
+++ b/neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java
@@ -32,10 +32,8 @@ import org.spongepowered.asm.mixin.injection.struct.InjectorGroupInfo;
 
 import java.lang.reflect.Field;
 import java.nio.file.Path;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 public class ModernFixPlatformHooksImpl implements ModernFixPlatformHooks {