diff --git a/src/minecraft/assemblyline/common/machine/TileEntityManipulator.java b/src/minecraft/assemblyline/common/machine/TileEntityManipulator.java
index 1bcb85ed8..3de2cb784 100644
--- a/src/minecraft/assemblyline/common/machine/TileEntityManipulator.java
+++ b/src/minecraft/assemblyline/common/machine/TileEntityManipulator.java
@@ -54,7 +54,7 @@ public class TileEntityManipulator extends TileEntityFilterable implements IReds
 	@Override
 	protected void onUpdate()
 	{
-		if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER)
+		if (!this.worldObj.isRemote)
 		{
 			if (this.ticks % 20 == 0)
 			{
@@ -225,7 +225,6 @@ public class TileEntityManipulator extends TileEntityFilterable implements IReds
 			/**
 			 * Try to put items into a chest.
 			 */
-			//System.out.println(itemStack.hashCode() + " @ " + direction.toString());
 			if (tileEntity instanceof TileEntityChest)
 			{
 				TileEntityChest[] chests = { (TileEntityChest) tileEntity, null };
diff --git a/src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java b/src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java
index 3fed46689..122229078 100644
--- a/src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java
+++ b/src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java
@@ -154,7 +154,7 @@ public class BlockConveyorBelt extends BlockMachine
 				}
 
 				((EntityItem) entity).age++;
-				((EntityItem) entity).delayBeforeCanPickup = 2;
+				((EntityItem) entity).delayBeforeCanPickup = 20;
 				entity.onGround = false;
 			}
 
@@ -203,4 +203,10 @@ public class BlockConveyorBelt extends BlockMachine
 	{
 		return false;
 	}
+
+	@Override
+	public int damageDropped(int par1)
+	{
+		return 0;
+	}
 }