diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java
index 3111da7fa..21c3a71c2 100644
--- a/src/main/java/appeng/block/AEBaseTileBlock.java
+++ b/src/main/java/appeng/block/AEBaseTileBlock.java
@@ -40,6 +40,8 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
@@ -185,11 +187,16 @@ public abstract class AEBaseTileBlock<T extends AEBaseTile> extends AEBaseBlock
     @Override
     public void onBlockPlacedBy(final World w, final BlockPos pos, final BlockState state, final LivingEntity placer,
             final ItemStack is) {
-        if (is.hasDisplayName()) {
-            final TileEntity te = this.getTileEntity(w, pos);
-            if (te instanceof AEBaseTile) {
-                // FIXME: Check if this will make it translated
-                ((AEBaseTile) w.getTileEntity(pos)).setName(is.getDisplayName().getString());
+        // Inherit the item stack's display name, but only if it's a user defined string
+        // rather
+        // than a translation component, since our custom naming cannot handle
+        // untranslated
+        // I18N strings and we would translate it using the server's locale :-(
+        AEBaseTile te = this.getTileEntity(w, pos);
+        if (te != null && is.hasDisplayName()) {
+            ITextComponent displayName = is.getDisplayName();
+            if (displayName instanceof StringTextComponent) {
+                te.setName(((StringTextComponent) displayName).getText());
             }
         }
     }
diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java
index 8c22cc754..2f9b202d3 100644
--- a/src/main/java/appeng/core/AppEng.java
+++ b/src/main/java/appeng/core/AppEng.java
@@ -92,23 +92,10 @@ public final class AppEng {
     public static final String MOD_ID = "appliedenergistics2";
     public static final String MOD_NAME = "Applied Energistics 2";
 
-    // FIXME replicate this in mods.toml!
-    // FIXME private static final String FORGE_CURRENT_VERSION =
-    // ForgeVersion.getVersion();
-    // FIXME private static final String FORGE_MAX_VERSION = (
-    // ForgeVersion.majorVersion + 1 ) + ".0.0.0";
-    // FIXME public static final String MOD_DEPENDENCIES = "required-after:forge@["
-    // + FORGE_CURRENT_VERSION + "," + FORGE_MAX_VERSION + ");after:ctm@[" +
-    // CTM.VERSION + ",);";
-
     private static AppEng INSTANCE;
 
     private final Registration registration;
 
-    /**
-     * determined in pre-init but used in init
-     */
-
     public AppEng() {
         if (INSTANCE != null) {
             throw new IllegalStateException();
diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java
index 4b9bd26f2..0f8b5d5a1 100644
--- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java
+++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java
@@ -168,9 +168,6 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 
         final ItemStack is = player.getHeldItem(hand);
 
-        // UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor( is.getItem() );
-        // AELog.info( "ID:" + id.toString() + " : " + is.getItemDamage() );
-
         final TunnelType tt = AEApi.instance().registries().p2pTunnel().getTunnelTypeByItem(is);
         if (!is.isEmpty() && is.getItem() instanceof IMemoryCard) {
             final IMemoryCard mc = (IMemoryCard) is.getItem();