diff --git a/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java b/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
index 93020fa2..c65a5ff8 100644
--- a/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
+++ b/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java
@@ -174,6 +174,8 @@ public class ModernFixClient {
     }
 
     public void onServerStarted(MinecraftServer server) {
+        if(!ModernFixMixinPlugin.instance.isOptionEnabled("feature.integrated_server_watchdog.IntegratedWatchdog"))
+            return;
         IntegratedWatchdog watchdog = new IntegratedWatchdog(server);
         watchdog.start();
     }
diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/GameRendererMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/GameRendererMixin.java
new file mode 100644
index 00000000..ee3a0f9d
--- /dev/null
+++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/GameRendererMixin.java
@@ -0,0 +1,21 @@
+package org.embeddedt.modernfix.common.mixin.perf.faster_item_rendering;
+
+import net.minecraft.client.renderer.GameRenderer;
+import org.embeddedt.modernfix.render.RenderState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(GameRenderer.class)
+public class GameRendererMixin {
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GameRenderer;renderLevel(FJLcom/mojang/blaze3d/vertex/PoseStack;)V", shift = At.Shift.BEFORE))
+    private void markRenderingLevel(CallbackInfo ci) {
+        RenderState.IS_RENDERING_LEVEL = true;
+    }
+
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GameRenderer;renderLevel(FJLcom/mojang/blaze3d/vertex/PoseStack;)V", shift = At.Shift.AFTER))
+    private void markNotRenderingLevel(CallbackInfo ci) {
+        RenderState.IS_RENDERING_LEVEL = false;
+    }
+}
diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/ItemRendererMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/ItemRendererMixin.java
index 179a83e7..5eed56ff 100644
--- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/ItemRendererMixin.java
+++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/ItemRendererMixin.java
@@ -13,6 +13,7 @@ import net.minecraft.client.resources.model.SimpleBakedModel;
 import net.minecraft.core.Direction;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.item.ItemStack;
+import org.embeddedt.modernfix.render.RenderState;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -47,7 +48,7 @@ public abstract class ItemRendererMixin {
      */
     @Inject(method = "renderModelLists", at = @At("HEAD"), cancellable = true)
     private void fasterItemRender(BakedModel model, ItemStack stack, int combinedLight, int combinedOverlay, PoseStack matrixStack, VertexConsumer buffer, CallbackInfo ci) {
-        if(!stack.isEmpty() && model.getClass() == SimpleBakedModel.class && transformType == ItemTransforms.TransformType.GUI && model.getTransforms().gui == ItemTransform.NO_TRANSFORM) {
+        if(!RenderState.IS_RENDERING_LEVEL && !stack.isEmpty() && model.getClass() == SimpleBakedModel.class && transformType == ItemTransforms.TransformType.GUI && model.getTransforms().gui == ItemTransform.NO_TRANSFORM) {
             ci.cancel();
             PoseStack.Pose pose = matrixStack.last();
             int[] combinedLights = new int[] {combinedLight, combinedLight, combinedLight, combinedLight};
diff --git a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
index 28733531..25adb46b 100644
--- a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
+++ b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
@@ -139,15 +139,14 @@ public class ModernFixEarlyConfig {
 
     private static final ImmutableMap<String, Boolean> DEFAULT_SETTING_OVERRIDES = ImmutableMap.<String, Boolean>builder()
             .put("mixin.perf.dynamic_resources", false)
-            .put("mixin.feature.reduce_loading_screen_freezes", false)
             .put("mixin.feature.direct_stack_trace", false)
             .put("mixin.perf.rewrite_registry", false)
             .put("mixin.perf.clear_mixin_classinfo", false)
             .put("mixin.perf.compress_blockstate", false)
             .put("mixin.bugfix.packet_leak", false)
             .put("mixin.perf.deduplicate_location", false)
-            .put("mixin.perf.preload_block_classes", false)
-            .put("mixin.perf.faster_singleplayer_load", false)
+            .put("mixin.perf.dynamic_entity_renderers", false)
+            .put("mixin.feature.integrated_server_watchdog", true)
             .put("mixin.perf.blast_search_trees", shouldReplaceSearchTrees)
             .put("mixin.devenv", isDevEnv)
             .put("mixin.perf.remove_spawn_chunks", isDevEnv)
diff --git a/common/src/main/java/org/embeddedt/modernfix/render/RenderState.java b/common/src/main/java/org/embeddedt/modernfix/render/RenderState.java
new file mode 100644
index 00000000..e869e383
--- /dev/null
+++ b/common/src/main/java/org/embeddedt/modernfix/render/RenderState.java
@@ -0,0 +1,5 @@
+package org.embeddedt.modernfix.render;
+
+public class RenderState {
+    public static boolean IS_RENDERING_LEVEL = false;
+}