diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java
index b71b7dcf7..a0577ddc4 100644
--- a/src/main/java/com/simibubi/create/AllTags.java
+++ b/src/main/java/com/simibubi/create/AllTags.java
@@ -129,13 +129,16 @@ public class AllTags {
 		}
 
 		private AllFluidTags(NameSpace namespace, String path) {
-			tag = FluidTags.makeWrapperTag(
-				new ResourceLocation(namespace.id, (path.isEmpty() ? "" : path + "/") + Lang.asId(name())).toString());
+			tag = FluidTags.createOptional(
+				new ResourceLocation(namespace.id, (path.isEmpty() ? "" : path + "/") + Lang.asId(name())));
 		}
 		
 		public boolean matches(Fluid fluid) {
 			return fluid != null && fluid.isIn(tag);
 		}
+		
+		static void loadClass() {
+		}
 	}
 
 	public static enum AllBlockTags {
@@ -197,5 +200,7 @@ public class AllTags {
 		AllBlockTags.FAN_TRANSPARENT.add(Blocks.IRON_BARS);
 
 		AllBlockTags.FAN_HEATERS.add(Blocks.MAGMA_BLOCK, Blocks.CAMPFIRE, Blocks.LAVA, Blocks.FIRE);
+		
+		AllFluidTags.loadClass();
 	}
 }
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java
index e32de6a55..c743000d6 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java
@@ -30,7 +30,6 @@ import net.minecraft.item.Items;
 import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.nbt.ListNBT;
-import net.minecraft.nbt.NBTUtil;
 import net.minecraft.network.datasync.DataParameter;
 import net.minecraft.network.datasync.DataSerializers;
 import net.minecraft.network.datasync.EntityDataManager;
@@ -165,8 +164,7 @@ public class OrientedContraptionEntity extends AbstractContraptionEntity {
 		yaw = compound.getFloat("Yaw");
 		pitch = compound.getFloat("Pitch");
 
-		setCouplingId(
-			compound.contains("OnCoupling") ? NBTUtil.readUniqueId(compound.getCompound("OnCoupling")) : null);
+		setCouplingId(compound.contains("OnCoupling") ? compound.getUniqueId("OnCoupling") : null);
 	}
 
 	@Override