diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/ImageComponentType.kt b/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/ImageComponentType.kt
index 39194f50c4..e3e69a713e 100644
--- a/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/ImageComponentType.kt
+++ b/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/ImageComponentType.kt
@@ -6,6 +6,7 @@ import at.petrak.hexcasting.common.lib.HexRegistries
 import at.petrak.hexcasting.common.lib.hex.HexImageComponents
 import at.petrak.hexcasting.xplat.IXplatAbstractions
 import com.mojang.serialization.Codec
+import io.netty.buffer.ByteBuf
 import net.minecraft.Util
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.network.codec.ByteBufCodecs
@@ -27,7 +28,7 @@ import net.minecraft.network.codec.StreamCodec
  */
 class ImageComponentType<T : Any>(
 	val dataCodec: Codec<T>,
-	val dataStreamCodec: StreamCodec<RegistryFriendlyByteBuf, T>,
+	val dataStreamCodec: StreamCodec<out ByteBuf, T>,
 	val transient: Boolean = false
 ) {
 	override fun toString(): String = Util.getRegisteredName(HexImageComponents.REGISTRY, this)
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/utils/CodecUtils.java b/Common/src/main/java/at/petrak/hexcasting/api/utils/CodecUtils.java
index e1d12ff524..7f732ca70e 100644
--- a/Common/src/main/java/at/petrak/hexcasting/api/utils/CodecUtils.java
+++ b/Common/src/main/java/at/petrak/hexcasting/api/utils/CodecUtils.java
@@ -20,8 +20,8 @@ public class CodecUtils {
      * plus the map-encoding system from {@link net.minecraft.network.codec.ByteBufCodecs#map}.
      */
     public static <B extends ByteBuf, K, V> StreamCodec<B, Map<K, V>> streamCodecDispatchedMap(
-            IntFunction<Map<K, V>> mapCreator, StreamCodec<B, K> keyCodec,
-            Function<K, StreamCodec<B, ? extends V>> valueCodecGetter
+            IntFunction<Map<K, V>> mapCreator, StreamCodec<? super B, K> keyCodec,
+            Function<K, StreamCodec<? super B, ? extends V>> valueCodecGetter
     ) {
         return new StreamCodec<>() {
             public Map<K, V> decode(B stream) {
@@ -50,7 +50,7 @@ public void encode(B stream, Map<K, V> map) {
             }
 
             @SuppressWarnings("unchecked")
-            private <V2 extends V> void encodeCasted(StreamCodec<B, V2> codec, B stream, V value) {
+            private <V2 extends V> void encodeCasted(StreamCodec<? super B, V2> codec, B stream, V value) {
                 codec.encode(stream, (V2) value);
             }
         };