diff --git a/src/main/scala/resonantinduction/core/prefab/part/connector/PartFramedNode.scala b/src/main/scala/resonantinduction/core/prefab/part/connector/PartFramedNode.scala
index c62564525..d52a8e2c0 100644
--- a/src/main/scala/resonantinduction/core/prefab/part/connector/PartFramedNode.scala
+++ b/src/main/scala/resonantinduction/core/prefab/part/connector/PartFramedNode.scala
@@ -88,7 +88,7 @@ abstract class PartFramedNode extends PartAbstract with TPartNodeProvider with T
   override def writeDesc(packet: MCDataOutput)
   {
     super.writeDesc(packet)
-    packet.writeByte(clientRenderMask)
+    packet.writeByte(node.connectedMask)
   }
 
   override def read(packet: MCDataInput, packetID: Int)
diff --git a/src/main/scala/resonantinduction/mechanical/fluid/pipe/NodePipe.scala b/src/main/scala/resonantinduction/mechanical/fluid/pipe/NodePipe.scala
index 5d8ed23e6..8badabb91 100644
--- a/src/main/scala/resonantinduction/mechanical/fluid/pipe/NodePipe.scala
+++ b/src/main/scala/resonantinduction/mechanical/fluid/pipe/NodePipe.scala
@@ -16,8 +16,6 @@ class NodePipe(parent: PartPipe) extends NodePressure(parent) with TMultipartNod
 {
   def pipe: PartPipe = getParent.asInstanceOf[PartPipe]
 
-  onConnectionChanged = () => if (!world.isRemote) pipe.sendConnectionUpdate()
-
   override def rebuild()
   {
     for (dir <- ForgeDirection.VALID_DIRECTIONS)
diff --git a/src/main/scala/resonantinduction/mechanical/fluid/pipe/PartPipe.scala b/src/main/scala/resonantinduction/mechanical/fluid/pipe/PartPipe.scala
index 600dfe6ec..8cbd9484e 100644
--- a/src/main/scala/resonantinduction/mechanical/fluid/pipe/PartPipe.scala
+++ b/src/main/scala/resonantinduction/mechanical/fluid/pipe/PartPipe.scala
@@ -32,6 +32,7 @@ class PartPipe extends PartFramedNode with TMaterial[PipeMaterial] with TColorab
   private var markPacket = true
 
   material = PipeMaterials.ceramic
+  node.onConnectionChanged = () => sendConnectionUpdate()
 
   def preparePlacement(meta: Int)
   {