diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java
index b6fd499..db1fc7c 100755
--- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java
+++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java
@@ -37,7 +37,7 @@ public abstract class MidnightConfig {
     private static final Pattern DECIMAL_ONLY = Pattern.compile("-?(\\d+\\.?\\d*|\\d*\\.?\\d+|\\.)");
     private static final Pattern HEXADECIMAL_ONLY = Pattern.compile("(-?[#0-9a-fA-F]*)");
     private static final Gson gson = new GsonBuilder()
-            .excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE)
+            .excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE).excludeFieldsWithModifiers(Modifier.FINAL)
             .addSerializationExclusionStrategy(new ExclusionStrategy() {
                 public boolean shouldSkipClass(Class<?> clazz) { return false; }
                 public boolean shouldSkipField(FieldAttributes fieldAttributes) { return fieldAttributes.getAnnotation(Entry.class) == null; }
@@ -70,13 +70,12 @@ public abstract class MidnightConfig {
         MidnightConfig instance = createInstance(modid, config);
 
         for (Field field : config.getFields()) {
-            EntryInfo info = new EntryInfo(field, modid);
             //noinspection ConstantValue
             if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class))
                     && !field.isAnnotationPresent(Server.class)
                     && !field.isAnnotationPresent(Hidden.class)
                     && PlatformFunctions.isClientEnv())
-                instance.addClientEntry(field, info);
+                instance.addClientEntry(field, new EntryInfo(field, modid));
         }
         instance.loadValuesFromJson();
     }
@@ -212,10 +211,10 @@ public abstract class MidnightConfig {
     public void onTabInit(String tabName, MidnightConfigListWidget list, MidnightConfigScreen screen) {
     }
 
-    public static Screen getScreen(Screen parent, String modid) {
+    public static MidnightConfigScreen getScreen(Screen parent, String modid) {
         return configInstances.get(modid).getScreen(parent);
     }
-    public Screen getScreen(Screen parent) {
+    public MidnightConfigScreen getScreen(Screen parent) {
         return new MidnightConfigScreen(parent, modid);
     }
 
diff --git a/fabric/build.gradle b/fabric/build.gradle
index a96efdb..2e4526c 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -31,6 +31,11 @@ loom {
             configName = "Test Minecraft Client"
             source sourceSets.test
         }
+        testServer {
+            server()
+            configName = "Test Minecraft Server"
+            source sourceSets.test
+        }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index e374310..82a98a1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ yarn_mappings=1.21.9+build.1
 enabled_platforms=fabric,neoforge
 
 archives_base_name=midnightlib
-mod_version=1.8.2
+mod_version=1.8.3
 maven_group=eu.midnightdust
 release_type=release
 curseforge_id=488090
@@ -15,7 +15,7 @@ modrinth_id=codAaoxh
 fabric_loader_version=0.17.2
 fabric_api_version=0.133.14+1.21.9
 
-neoforge_version=21.9.3-beta
+neoforge_version=21.9.9-beta
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 mod_menu_version = 9.0.0
\ No newline at end of file
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index 3184821..9ed0299 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -39,6 +39,20 @@ loom {
             client()
             name = "Test Minecraft Client"
 
+            mods {
+                create('midnightlib') {
+                    sourceSet sourceSets.main
+                }
+                create('modid') {      // test mod
+                    sourceSet sourceSets.test
+                }
+            }
+            source sourceSets.test
+        }
+        testServer {
+            server()
+            name = "Test Minecraft Server"
+
             mods {
                 create('midnightlib') {
                     sourceSet sourceSets.main