diff --git a/fml/build.xml b/fml/build.xml
index 02c0e1cbf..18a45f400 100644
--- a/fml/build.xml
+++ b/fml/build.xml
@@ -97,8 +97,6 @@
   		<condition>
   	        <not>
   	        	<and>
-  	        	  <available file="${mcp.home}/temp/server.md5"/>
-                  <available file="${mcp.home}/temp/server_reobf.md5"/>
   	        	  <available file="${mcp.home}/temp/client.md5"/>
                   <available file="${mcp.home}/temp/client_reobf.md5"/>
   	        	</and>
diff --git a/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java b/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
index f56c95db5..97fb996ce 100644
--- a/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
+++ b/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
@@ -318,7 +318,7 @@ public class FMLNetworkHandler
         }
         Packet250CustomPayload pkt = new Packet250CustomPayload();
         pkt.field_73630_a = "FML";
-        pkt.field_73629_c = FMLPacket.makePacket(Type.ENTITYSPAWN, er, entity);
+        pkt.field_73629_c = FMLPacket.makePacket(Type.ENTITYSPAWN, er, entity, instance().findNetworkModHandler(er.getContainer()));
         pkt.field_73628_b = pkt.field_73629_c.length;
         return pkt;
     }