diff --git a/build.gradle b/build.gradle
index f4877e97..2ff23a8f 100755
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ apply plugin: 'forge' // adds the forge dependency
 apply plugin: 'maven' // for uploading to a maven repo
 apply plugin: 'checkstyle'
 
-version = "7.0.16"
+version = "7.0.17"
 group= "com.mod-buildcraft"
 archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension]
 
diff --git a/buildcraft_resources/changelog/7.0.17 b/buildcraft_resources/changelog/7.0.17
index aa00367b..9fb472f9 100644
--- a/buildcraft_resources/changelog/7.0.17
+++ b/buildcraft_resources/changelog/7.0.17
@@ -4,9 +4,12 @@ Improvements:
 
 Bugs fixed:
 
+* [#2904] Crash on corrupt facade (asie)
 * [#2892] Disconnect on large-resolution Zone Planner fullscreen (asie)
 * [#2891] Boxes ignoring the south and east boundaries when rounding (hea3ven)
 * Accidentally setting an area in the Zone Planner GUI upon pressing fullscreen (asie)
+* Compact Lens->Filter "diodes" not acting correctly (asie)
+* Gate Copiers not clearing correctly (asie)
 * Paintbrush not being re-dyeable if not fully used (asie)
 * Robots going to unreachable stations passing through walls (hea3ven)
 * Stripes Pipe "breaking" fluid blocks (asie)
diff --git a/buildcraft_resources/versions.txt b/buildcraft_resources/versions.txt
index 8b1ed3a9..971cdec3 100755
--- a/buildcraft_resources/versions.txt
+++ b/buildcraft_resources/versions.txt
@@ -1,3 +1,3 @@
 1.6.4:BuildCraft:4.2.2
 1.7.2:BuildCraft:6.0.16
-1.7.10:BuildCraft:7.0.16
+1.7.10:BuildCraft:7.0.17
diff --git a/common/buildcraft/robotics/gui/ContainerZonePlan.java b/common/buildcraft/robotics/gui/ContainerZonePlan.java
index ce050cef..dfb04f20 100755
--- a/common/buildcraft/robotics/gui/ContainerZonePlan.java
+++ b/common/buildcraft/robotics/gui/ContainerZonePlan.java
@@ -129,8 +129,8 @@ public class ContainerZonePlan extends BuildCraftContainer implements ICommandRe
 		MapWorld w = BuildCraftRobotics.manager.getWorld(map.getWorldObj());
 		int startX = cx - width * blocksPerPixel / 2;
 		int startZ = cz - height * blocksPerPixel / 2;
-		int mapStartX = (map.chunkStartX << 4);
-		int mapStartZ = (map.chunkStartZ << 4);
+		int mapStartX = map.chunkStartX << 4;
+		int mapStartZ = map.chunkStartZ << 4;
 
 		for (int i = 0; i < width; ++i) {
 			for (int j = 0; j < height; ++j) {
diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java
index 5e614da1..f3d381bc 100644
--- a/common/buildcraft/transport/ItemFacade.java
+++ b/common/buildcraft/transport/ItemFacade.java
@@ -156,7 +156,9 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem, IPipePlug
 	public String getItemStackDisplayName(ItemStack itemstack) {
 		switch (getFacadeType(itemstack)) {
 			case Basic:
-				return super.getItemStackDisplayName(itemstack) + ": " + getFacadeStateDisplayName(getFacadeStates(itemstack)[0]);
+				FacadeState[] states = getFacadeStates(itemstack);
+				String displayName = states.length > 0 ? getFacadeStateDisplayName(states[0]) : "CORRUPT";
+				return super.getItemStackDisplayName(itemstack) + ": " + displayName;
 			case Phased:
 				return StringUtils.localize("item.FacadePhased.name");
 			default:
diff --git a/common/buildcraft/transport/ItemGateCopier.java b/common/buildcraft/transport/ItemGateCopier.java
index 30261fa9..c5678ae9 100644
--- a/common/buildcraft/transport/ItemGateCopier.java
+++ b/common/buildcraft/transport/ItemGateCopier.java
@@ -75,7 +75,10 @@ public class ItemGateCopier extends ItemBuildCraft {
 				player.addChatMessage(new ChatComponentTranslation("chat.gateCopier.clear"));
 				return true;
 			}
-			
+
+			data = new NBTTagCompound();
+			stack.setTagCompound(data);
+
 			gate.writeStatementsToNBT(data);
 			data.setByte("material", (byte) gate.material.ordinal());
 			data.setByte("logic", (byte) gate.logic.ordinal());