diff --git a/gradle.properties b/gradle.properties
index 1c23e4f1c..db85230e3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,12 +4,12 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # mod version info
-mod_version=0.3c
+mod_version=0.3d
 minecraft_version=1.15.2
 forge_version=31.2.31
 
 # dependency versions
-registrate_version=0.0.4.18
+registrate_version=1.0.0-rc.17
 jei_version=6.0.0.2
 
 # curseforge information
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedFluidStorage.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedFluidStorage.java
index 135996fb4..1709ae7d9 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedFluidStorage.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedFluidStorage.java
@@ -120,7 +120,7 @@ public class MountedFluidStorage {
 			return;
 
 		SmartFluidTank inv = (SmartFluidTank) teHandler;
-		inv.setFluid(tank.getFluid());
+		inv.setFluid(tank.getFluid().copy());
 	}
 
 	public IFluidHandler getFluidHandler() {
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java
index 294a0582a..f677487af 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java
@@ -12,6 +12,7 @@ import com.simibubi.create.content.schematics.ISpecialEntityItemRequirement;
 import com.simibubi.create.content.schematics.ItemRequirement;
 import com.simibubi.create.content.schematics.ItemRequirement.ItemUseType;
 import com.simibubi.create.foundation.networking.AllPackets;
+import com.simibubi.create.foundation.utility.BlockFace;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
@@ -272,9 +273,9 @@ public class SuperGlueEntity extends Entity implements IEntityAdditionalSpawnDat
 		if (ray.getType() == Type.MISS)
 			return;
 		BlockRayTraceResult blockRay = (BlockRayTraceResult) ray;
-		if (!blockRay.getPos()
-			.offset(blockRay.getFace())
-			.equals(getHangingPosition()))
+		BlockFace rayFace = new BlockFace(blockRay.getPos(), blockRay.getFace());
+		BlockFace hangingFace = new BlockFace(getHangingPosition(), getFacingDirection().getOpposite());
+		if (!rayFace.isEquivalent(hangingFace))
 			return;
 
 		for (Hand handIn : Hand.values()) {
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java
index 54f1df414..34190f8b8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java
@@ -63,6 +63,8 @@ public class SuperGlueHandler {
 		ItemStack itemstack = placer.getHeldItemOffhand();
 		if (!AllItems.SUPER_GLUE.isIn(itemstack))
 			return;
+		if (AllItems.WRENCH.isIn(placer.getHeldItemMainhand()))
+			return;
 
 		double distance = placer.getAttribute(PlayerEntity.REACH_DISTANCE)
 			.getValue();
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/CapabilityMinecartController.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/CapabilityMinecartController.java
index 715b4c1e2..d26c72d35 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/CapabilityMinecartController.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/CapabilityMinecartController.java
@@ -102,7 +102,8 @@ public class CapabilityMinecartController implements ICapabilitySerializable<Com
 			
 			if (world.isRemote && carts.containsKey(uniqueID)) {
 				MinecartController minecartController = carts.get(uniqueID);
-				if (minecartController.isPresent() && minecartController.cart().getEntityId() != cart.getEntityId())
+				AbstractMinecartEntity minecartEntity = minecartController.cart();
+				if (minecartEntity != null && minecartEntity.getEntityId() != cart.getEntityId()) 
 					continue; // Away with you, Fake Entities!
 			}