diff --git a/src/main/java/carpet/mixins/Main_clientCoreMixin.java b/src/main/java/carpet/mixins/Main_clientCoreMixin.java
index 7e886d93..52e655d9 100644
--- a/src/main/java/carpet/mixins/Main_clientCoreMixin.java
+++ b/src/main/java/carpet/mixins/Main_clientCoreMixin.java
@@ -10,6 +10,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(Main.class)
 public class Main_clientCoreMixin
 {
+    @SuppressWarnings("UnresolvedMixinReference")
     @Inject(method = "main", at = @At( // little bit later giving extensions time to react an join the train
             value = "INVOKE",
             target = "Ljoptsimple/OptionParser;parse([Ljava/lang/String;)Ljoptsimple/OptionSet;")
diff --git a/src/main/java/carpet/mixins/Main_serverCoreMixin.java b/src/main/java/carpet/mixins/Main_serverCoreMixin.java
index 57f45d21..f66737e7 100644
--- a/src/main/java/carpet/mixins/Main_serverCoreMixin.java
+++ b/src/main/java/carpet/mixins/Main_serverCoreMixin.java
@@ -10,6 +10,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(Main.class)
 public class Main_serverCoreMixin
 {
+    @SuppressWarnings("UnresolvedMixinReference")
     @Inject(method = "main", at = @At( // little bit later than main to add chance for extensions to register.
             value = "INVOKE",
             target = "Ljoptsimple/OptionParser;parse([Ljava/lang/String;)Ljoptsimple/OptionSet;")
diff --git a/src/main/java/carpet/script/CarpetScriptServer.java b/src/main/java/carpet/script/CarpetScriptServer.java
index 6470606f..d4edca09 100644
--- a/src/main/java/carpet/script/CarpetScriptServer.java
+++ b/src/main/java/carpet/script/CarpetScriptServer.java
@@ -54,12 +54,12 @@ public class CarpetScriptServer
 
     public CarpetScriptServer(MinecraftServer server)
     {
+        this.server = server;
         init();
     }
 
     private void init()
     {
-        this.server = server;
         ScriptHost.systemGlobals.clear();
         events = new CarpetEventServer(server);
         modules = new HashMap<>();
@@ -84,9 +84,7 @@ public class CarpetScriptServer
 
     public Module getModule(String name, boolean allowLibraries)
     {
-        File folder = CarpetServer.minecraft_server.getSavePath(WorldSavePath.ROOT).resolve("scripts").toFile();
-        File folder = server.getLevelStorage().resolveFile(
-                server.getLevelName(), "scripts");
+        File folder = server.getSavePath(WorldSavePath.ROOT).resolve("scripts").toFile();
         File[] listOfFiles = folder.listFiles();
         if (listOfFiles != null)
             for (File script : listOfFiles)
@@ -120,9 +118,7 @@ public class CarpetScriptServer
                 if (!mi.isLibrary()) moduleNames.add(mi.getName());
             }
         }
-        File folder = CarpetServer.minecraft_server.getSavePath(WorldSavePath.ROOT).resolve("scripts").toFile();
-        File folder = server.getLevelStorage().resolveFile(
-                server.getLevelName(), "scripts");
+        File folder = server.getSavePath(WorldSavePath.ROOT).resolve("scripts").toFile();
         File[] listOfFiles = folder.listFiles();
         if (listOfFiles == null)
             return moduleNames;
diff --git a/src/main/java/carpet/script/bundled/Module.java b/src/main/java/carpet/script/bundled/Module.java
index 2e4ccba2..1916e0ba 100644
--- a/src/main/java/carpet/script/bundled/Module.java
+++ b/src/main/java/carpet/script/bundled/Module.java
@@ -35,8 +35,6 @@ public abstract class Module
     {
         File dataFile = resolveResource(module, file, "nbt", isShared);
         if (dataFile == null) return null;
-        if (!isShared && (module == null || module.getName() == null)) return null;
-        File dataFile = CarpetServer.minecraft_server.getSavePath(WorldSavePath.ROOT).resolve("scripts/"+getDescriptor(module, file, isShared)+".nbt").toFile();
         if (!Files.exists(dataFile.toPath()) || !(dataFile.isFile())) return null;
         synchronized (writeIOSync) { return FileModule.read(dataFile); }
     }
@@ -45,8 +43,6 @@ public abstract class Module
     {
         File dataFile = resolveResource(module, file, "nbt", isShared);
         if (dataFile == null) return false;
-        if (!isShared && (module == null || module.getName() == null)) return false;
-        File dataFile =CarpetServer.minecraft_server.getSavePath(WorldSavePath.ROOT).resolve("scripts/"+getDescriptor(module, file, isShared)+".nbt").toFile();
         if (!Files.exists(dataFile.toPath().getParent()) && !dataFile.getParentFile().mkdirs()) return false;
         synchronized (writeIOSync) { return FileModule.write(globalState, dataFile); }
     }
@@ -77,8 +73,7 @@ public abstract class Module
     private static File resolveResource(Module module, String resourceName, String ext, boolean isShared)
     {
         if (!isShared && (module == null || module.getName() == null)) return null;
-        return CarpetServer.minecraft_server.getLevelStorage().resolveFile(
-                CarpetServer.minecraft_server.getLevelName(), "scripts/"+getDescriptor(module, resourceName, isShared)+"."+ext);
+        return CarpetServer.minecraft_server.getSavePath(WorldSavePath.ROOT).resolve("scripts/"+getDescriptor(module, resourceName, isShared)+"."+ext).toFile();
     }
 
     @Override