diff --git a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
index 525db0fe3..b546c6065 100644
--- a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
+++ b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
@@ -130,8 +130,9 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable implements I
         this.powerMultiplier = powerMultiplier;
     }
 
+    @Override
     public int availableUpgrades() {
-        return 2;
+        return 1;
     }
 
     @Override
diff --git a/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java b/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java
index 23753b534..e6aefca4e 100644
--- a/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java
+++ b/src/main/java/appeng/container/implementations/ContainerWirelessPatternTerminal.java
@@ -251,7 +251,7 @@ public class ContainerWirelessPatternTerminal extends ContainerPatternEncoder im
 
     @Override
     public int availableUpgrades() {
-        return 2;
+        return 1;
     }
 
     @Override
diff --git a/src/main/java/appeng/fluids/client/gui/GuiMEPortableFluidCell.java b/src/main/java/appeng/fluids/client/gui/GuiMEPortableFluidCell.java
index 3660f1f42..9b6aa48be 100644
--- a/src/main/java/appeng/fluids/client/gui/GuiMEPortableFluidCell.java
+++ b/src/main/java/appeng/fluids/client/gui/GuiMEPortableFluidCell.java
@@ -121,7 +121,7 @@ public class GuiMEPortableFluidCell extends AEBaseMEGui implements ISortSource,
 
     @Override
     public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
-        this.fontRenderer.drawString(this.getGuiDisplayName("Fluid Terminal"), 8, 6, 4210752);
+        this.fontRenderer.drawString(this.getGuiDisplayName(GuiText.WirelessTerminal.getLocal()), 8, 6, 4210752);
         this.fontRenderer.drawString(GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752);
     }
 
diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java
index 8d12c604e..68daf4dad 100644
--- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java
+++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java
@@ -213,7 +213,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
                                 continue;
                             }
 
-                            if (i.getThrower().equals(entityIn.getName()) && i.cannotPickup()) {
+                            if (i.getThrower() != null && i.getThrower().equals(entityIn.getName()) && i.cannotPickup()) {
                                 continue;
                             }
 
diff --git a/src/main/resources/assets/appliedenergistics2/textures/guis/wirelessupgrades.png b/src/main/resources/assets/appliedenergistics2/textures/guis/wirelessupgrades.png
new file mode 100644
index 000000000..ed7b89c10
Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/guis/wirelessupgrades.png differ