diff --git a/common/buildcraft/builders/BuilderProxyClient.java b/common/buildcraft/builders/BuilderProxyClient.java
index 55169d25..48bf5a24 100644
--- a/common/buildcraft/builders/BuilderProxyClient.java
+++ b/common/buildcraft/builders/BuilderProxyClient.java
@@ -38,20 +38,25 @@ public class BuilderProxyClient extends BuilderProxy {
 		super.registerBlockRenderers();
 
 		ClientRegistry.bindTileEntitySpecialRenderer(TileUrbanist.class, new RenderBoxProvider());
-		ClientRegistry.bindTileEntitySpecialRenderer(TileArchitect.class, new RenderArchitect());
-		ClientRegistry.bindTileEntitySpecialRenderer(TileFiller.class, new RenderBuilder());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileBuilder.class, new RenderBuilderTile());
 		ClientRegistry.bindTileEntitySpecialRenderer(TilePathMarker.class, new RenderPathMarker());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileConstructionMarker.class, new RenderConstructionMarker());
 
-		ClientRegistry.bindTileEntitySpecialRenderer(TileArchitect.class, new RenderLEDTile(BuildCraftBuilders.architectBlock));
-		ClientRegistry.bindTileEntitySpecialRenderer(TileFiller.class, new RenderLEDTile(BuildCraftBuilders.fillerBlock));
+		ClientRegistry.bindTileEntitySpecialRenderer(TileFiller.class, new RenderMultiTESR(new TileEntitySpecialRenderer[] {
+				new RenderLEDTile(BuildCraftBuilders.fillerBlock),
+				new RenderBuilder()
+		}));
 
 		ClientRegistry.bindTileEntitySpecialRenderer(TileQuarry.class, new RenderMultiTESR(new TileEntitySpecialRenderer[] {
 				new RenderLEDTile(BuildCraftBuilders.quarryBlock),
 				new RenderBuilder()
 		}));
 
+		ClientRegistry.bindTileEntitySpecialRenderer(TileArchitect.class, new RenderMultiTESR(new TileEntitySpecialRenderer[] {
+				new RenderLEDTile(BuildCraftBuilders.architectBlock),
+				new RenderArchitect()
+		}));
+
 		RenderingRegistry.registerEntityRenderingHandler(EntityMechanicalArm.class, new RenderVoid());
 	}
 
diff --git a/common/buildcraft/core/render/RenderBox.java b/common/buildcraft/core/render/RenderBox.java
index 817df024..0b237dd6 100755
--- a/common/buildcraft/core/render/RenderBox.java
+++ b/common/buildcraft/core/render/RenderBox.java
@@ -26,7 +26,7 @@ public final class RenderBox {
 
 	public static void doRender(TextureManager t, ResourceLocation texture, Box box) {
 		GL11.glPushMatrix();
-		GL11.glDisable(2896 /* GL_LIGHTING */);
+		GL11.glDisable(GL11.GL_LIGHTING);
 
 		box.createLaserData();
 
@@ -38,7 +38,7 @@ public final class RenderBox {
 			GL11.glPopMatrix();
 		}
 
-		GL11.glEnable(2896 /* GL_LIGHTING */);
+		GL11.glEnable(GL11.GL_LIGHTING);
 		GL11.glPopMatrix();
 	}
 
diff --git a/common/buildcraft/core/render/RenderBoxProvider.java b/common/buildcraft/core/render/RenderBoxProvider.java
index 43ce0789..4b62f29e 100755
--- a/common/buildcraft/core/render/RenderBoxProvider.java
+++ b/common/buildcraft/core/render/RenderBoxProvider.java
@@ -38,8 +38,6 @@ public class RenderBoxProvider extends TileEntitySpecialRenderer {
 		GL11.glDisable(GL11.GL_LIGHTING);
 		GL11.glEnable(GL11.GL_BLEND);
 		GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-
-		GL11.glPushMatrix();
 		GL11.glTranslated(-tileentity.xCoord, -tileentity.yCoord, -tileentity.zCoord);
 		GL11.glTranslated(x, y, z);
 
@@ -61,8 +59,6 @@ public class RenderBoxProvider extends TileEntitySpecialRenderer {
 			}
 		}
 
-		GL11.glPopMatrix();
-
 		GL11.glPopAttrib();
 		GL11.glPopMatrix();
 	}