diff --git a/xplat/src/main/java/lgbt/greenhouse/config/impl/GreenhouseConfigImpl.java b/xplat/src/main/java/lgbt/greenhouse/config/impl/GreenhouseConfigImpl.java
index 6f322d4..25a48e9 100644
--- a/xplat/src/main/java/lgbt/greenhouse/config/impl/GreenhouseConfigImpl.java
+++ b/xplat/src/main/java/lgbt/greenhouse/config/impl/GreenhouseConfigImpl.java
@@ -95,7 +95,7 @@ public class GreenhouseConfigImpl {
 																		NetworkData networkData) {
 		Object config = ((AbstractGreenhouseConfigHolderImpl<Object, Object, ?>) resolvedHolder).getConfig(localData, networkData);
 		if (config instanceof MergedConfigValue<?, ?>(Object common, Object sided)) {
-			GreenhouseConfigHolderImpl<Config> impl = (GreenhouseConfigHolderImpl<Config>) holder;
+			AbstractGreenhouseConfigHolderImpl<LocalData, NetworkData, Config> impl = (AbstractGreenhouseConfigHolderImpl<LocalData, NetworkData, Config>) holder;
 			if (impl.getSide() == GreenhouseConfigSide.COMMON) {
 				return (Config) common;
 			}
@@ -144,8 +144,8 @@ public class GreenhouseConfigImpl {
 		//noinspection unchecked
 		AbstractGreenhouseConfigHolderImpl<?, ?, Object> holderImpl = (AbstractGreenhouseConfigHolderImpl<?, ?, Object>) resolvedHolder;
 
-		Object localData = holderImpl.getLocalData(config);
-		Object networkData = holderImpl.getNetworkData(config);
+		var localData = holderImpl.getLocalData(config);
+		var networkData = holderImpl.getNetworkData(config);
 
 		if (LOCAL_CONFIGS.containsKey(resolvedHolder)) {
 			LOCAL_CONFIGS.put(resolvedHolder, localData);
@@ -161,7 +161,12 @@ public class GreenhouseConfigImpl {
 	}
 
 	public static <Config> void saveConfig(GreenhouseConfigHolder<Config> holder) {
-		saveConfig(holder, getLocalConfig(holder));
+		GreenhouseConfigHolder<Object> mergedHolder = (GreenhouseConfigHolder<Object>) resolveMergedConfigHolder(holder);
+
+		var localData = getLocalData(mergedHolder);
+		var networkData = getNetworkData(mergedHolder);
+
+		saveConfig(mergedHolder, ((AbstractGreenhouseConfigHolderImpl<Object, Object, ?>)mergedHolder).getConfig(localData, networkData));
 	}
 
 	public static <Config, Lang> void saveConfig(GreenhouseConfigHolder<Config> holder, Config value) {
@@ -175,7 +180,7 @@ public class GreenhouseConfigImpl {
 				.resolve(holderImpl.getModId() + "." + holderImpl.getConfigLang().getFileExtension())
 				.toFile();
 		GreenhouseConfigLangExecutor<Lang> executor = (GreenhouseConfigLangExecutor<Lang>) EXECUTORS
-				.computeIfAbsent(holderImpl, configHolder -> new GreenhouseConfigLangExecutor<>(lang));
+				.computeIfAbsent(holderImpl, _ -> new GreenhouseConfigLangExecutor<>(lang));
 
 		try {
 			saveConfigInternal(holderImpl, executor, value, file);
@@ -263,7 +268,10 @@ public class GreenhouseConfigImpl {
 				continue;
 			}
 
-			saveConfig(casted, getLocalConfig(casted));
+			var localData = getLocalData(holder);
+			var networkData = getNetworkData(holder);
+
+			saveConfig(casted, ((AbstractGreenhouseConfigHolderImpl<Object, Object, ?>) holder).getConfig(localData, networkData));
 			writeSchemaVersion(GreenhouseConfigConstants.getPlatformHelper()
 							.getConfigDir()
 							.resolve(impl.getModId() + "." + impl.getConfigLang().getFileExtension()),
diff --git a/xplat/src/main/java/lgbt/greenhouse/config/impl/client/GreenhouseConfigClientImpl.java b/xplat/src/main/java/lgbt/greenhouse/config/impl/client/GreenhouseConfigClientImpl.java
index b8ec748..2dfee8b 100644
--- a/xplat/src/main/java/lgbt/greenhouse/config/impl/client/GreenhouseConfigClientImpl.java
+++ b/xplat/src/main/java/lgbt/greenhouse/config/impl/client/GreenhouseConfigClientImpl.java
@@ -18,7 +18,6 @@ public class GreenhouseConfigClientImpl {
 		SYNCED_CONFIGS.put(holder, networkData);
 	}
 
-	@SuppressWarnings("unchecked")
 	public static <LocalData, NetworkData, Config> Config getConfig(GreenhouseConfigHolder<Config> holder, boolean local) {
 		// Resolve to the merged config.
 		var resolvedHolder = GreenhouseConfigImpl.resolveMergedConfigHolder(holder);