diff --git a/src/main/java/com/replaymod/core/ReplayMod.java b/src/main/java/com/replaymod/core/ReplayMod.java
index 8a0ce753..f1d42495 100755
--- a/src/main/java/com/replaymod/core/ReplayMod.java
+++ b/src/main/java/com/replaymod/core/ReplayMod.java
@@ -73,6 +73,7 @@ import net.fabricmc.loader.api.FabricLoader;
 //$$ import net.minecraftforge.fml.common.Mod.Instance;
 //$$ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 //$$ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+//$$ import static com.replaymod.core.versions.MCVer.FORGE_BUS;
 //#if MC>=10800
 //$$ import net.minecraftforge.fml.client.FMLClientHandler;
 //#else
diff --git a/src/main/java/com/replaymod/core/versions/MCVer.java b/src/main/java/com/replaymod/core/versions/MCVer.java
index 0e7f8583..387154c4 100644
--- a/src/main/java/com/replaymod/core/versions/MCVer.java
+++ b/src/main/java/com/replaymod/core/versions/MCVer.java
@@ -363,7 +363,7 @@ public class MCVer {
 
     @SuppressWarnings("unchecked")
     public static List<Box> cubeList(Cuboid modelRenderer) {
-        //#if MC>=11400
+        //#if MC>=11500
         //$$ return new ArrayList<>(); // FIXME 1.15
         //#else
         return modelRenderer.boxes;
diff --git a/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyColorSky.java b/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyColorSky.java
index da392d3c..5f2edc17 100644
--- a/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyColorSky.java
+++ b/src/main/java/com/replaymod/render/mixin/Mixin_ChromaKeyColorSky.java
@@ -20,7 +20,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class Mixin_ChromaKeyColorSky {
     @Shadow @Final private MinecraftClient client;
 
+    //#if MC>=11400
     @Inject(method = "renderSky", at = @At("HEAD"), cancellable = true)
+    //#else
+    //$$ @Inject(method = "renderSky(FI)V", at = @At("HEAD"), cancellable = true)
+    //#endif
     private void chromaKeyingSky(CallbackInfo ci) {
         EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) this.client.gameRenderer).replayModRender_getHandler();
         if (handler != null) {
diff --git a/src/main/java/com/replaymod/render/rendering/Pipeline.java b/src/main/java/com/replaymod/render/rendering/Pipeline.java
index 6427d42f..4027b742 100644
--- a/src/main/java/com/replaymod/render/rendering/Pipeline.java
+++ b/src/main/java/com/replaymod/render/rendering/Pipeline.java
@@ -18,7 +18,9 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+//#if MC>=11400
 import static com.replaymod.core.versions.MCVer.getWindow;
+//#endif
 
 public class Pipeline<R extends Frame, P extends Frame> implements Runnable {
 
diff --git a/src/main/java/com/replaymod/render/rendering/VideoRenderer.java b/src/main/java/com/replaymod/render/rendering/VideoRenderer.java
index 1afe2079..baf414a5 100644
--- a/src/main/java/com/replaymod/render/rendering/VideoRenderer.java
+++ b/src/main/java/com/replaymod/render/rendering/VideoRenderer.java
@@ -261,13 +261,9 @@ public class VideoRenderer implements RenderInfo {
 
         // FBOs are always used in 1.14+
         //#if MC<11400
-        if (!GLX.isUsingFBOs()) {
-            //#if MC>=11300
-            GLFW.glfwSetWindowAttrib(getWindow(mc).getHandle(), GLFW.GLFW_RESIZABLE, 1);
-            //#else
-            //$$ Display.setResizable(false);
-            //#endif
-        }
+        //$$ if (!OpenGlHelper.isFramebufferEnabled()) {
+        //$$     Display.setResizable(false);
+        //$$ }
         //#endif
         if (mc.options.debugEnabled) {
             debugInfoWasShown = true;
@@ -339,13 +335,9 @@ public class VideoRenderer implements RenderInfo {
 
         // FBOs are always used in 1.14+
         //#if MC<11400
-        if (!GLX.isUsingFBOs()) {
-            //#if MC>=11300
-            GLFW.glfwSetWindowAttrib(getWindow(mc).getHandle(), GLFW.GLFW_RESIZABLE, 0);
-            //#else
-            //$$ Display.setResizable(true);
-            //#endif
-        }
+        //$$ if (!OpenGlHelper.isFramebufferEnabled()) {
+        //$$     Display.setResizable(true);
+        //$$ }
         //#endif
         mc.options.debugEnabled = debugInfoWasShown;
         if (mouseWasGrabbed) {
diff --git a/src/main/java/com/replaymod/replay/QuickReplaySender.java b/src/main/java/com/replaymod/replay/QuickReplaySender.java
index b433cf67..480112b0 100644
--- a/src/main/java/com/replaymod/replay/QuickReplaySender.java
+++ b/src/main/java/com/replaymod/replay/QuickReplaySender.java
@@ -39,10 +39,15 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.function.Consumer;
 
+//#if MC>=11400
+import net.minecraft.world.dimension.DimensionType;
+//#else
+//$$ import net.minecraft.world.EnumDifficulty;
+//#endif
+
 //#if MC>=11200
 import com.replaymod.core.utils.WrappedTimer;
 import net.minecraft.world.GameMode;
-import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.level.LevelGeneratorType;
 //#endif
 
@@ -180,12 +185,16 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
     public void restart() {
         replay.reset();
         ctx.fireChannelRead(new PlayerRespawnS2CPacket(
+                //#if MC>=11400
                 DimensionType.OVERWORLD,
+                //#else
+                //$$ 0,
+                //#endif
                 //#if MC>=11500
                 //$$ 0,
                 //#endif
                 //#if MC<11400
-                //$$ Difficulty.NORMAL,
+                //$$ EnumDifficulty.NORMAL,
                 //#endif
                 LevelGeneratorType.DEFAULT,
                 GameMode.SPECTATOR