diff --git a/src/main/java/resonantinduction/electrical/battery/TileBattery.java b/src/main/java/resonantinduction/electrical/battery/TileBattery.java
index 368d4a13..ad8990c9 100644
--- a/src/main/java/resonantinduction/electrical/battery/TileBattery.java
+++ b/src/main/java/resonantinduction/electrical/battery/TileBattery.java
@@ -78,7 +78,7 @@ public class TileBattery extends TileElectrical implements IConnector<BatteryNet
 				}
 			}
 
-			energy.setMaxTransfer(DEFAULT_WATTAGE * this.getNetwork().getConnectors().size());
+			energy.setMaxTransfer((long) Math.min(Math.pow(1000, this.getNetwork().getConnectors().size()), energy.getEnergyCapacity()));
 			markDistributionUpdate = true;
 			markClientUpdate = true;
 		}
diff --git a/src/main/java/resonantinduction/electrical/wire/trait/TraitConductor.java b/src/main/java/resonantinduction/electrical/wire/trait/TraitConductor.java
index e148a911..7bf79b87 100644
--- a/src/main/java/resonantinduction/electrical/wire/trait/TraitConductor.java
+++ b/src/main/java/resonantinduction/electrical/wire/trait/TraitConductor.java
@@ -101,9 +101,14 @@ public class TraitConductor extends TileMultipart implements IConductor
 		/**
 		 * Try out different sides to try to inject energy into.
 		 */
-		if (this.partMap(from.ordinal()) == null)
+		if (partMap(from.ordinal()) instanceof IConductor)
 		{
-			for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
+			return ((IConductor) partMap(from.ordinal())).onReceiveEnergy(from, receive, doReceive);
+		}
+
+		for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
+		{
+			if (dir != from.getOpposite())
 			{
 				TMultiPart part = this.partMap(dir.ordinal());