diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java
index eb3e50308..51034d4f7 100644
--- a/src/main/java/appeng/client/gui/AEBaseGui.java
+++ b/src/main/java/appeng/client/gui/AEBaseGui.java
@@ -191,14 +191,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
         GlStateManager.disableDepth();
     }
 
-    @Nonnull
-    @Override
-    public List<String> getItemToolTip(@Nonnull ItemStack itemStack) {
-        List<String> l = super.getItemToolTip(itemStack);
-        l.add(1, TextFormatting.GRAY + String.valueOf(itemStack.getCount()));
-        return l;
-    }
-
     public List<Rectangle> getJEIExclusionArea() {
         return Collections.emptyList();
     }
@@ -904,8 +896,9 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
                         this.itemRender.zLevel = 0.0F;
                     }
                 }
-
-                if (s instanceof AppEngSlot) {
+                if (s instanceof SlotPlayerInv || s instanceof SlotPlayerHotBar) {
+                    super.drawSlot(s);
+                } else if (s instanceof AppEngSlot) {
                     ((AppEngSlot) s).setDisplay(true);
                     this.zLevel = 100.0F;
                     this.itemRender.zLevel = 100.0F;
diff --git a/src/main/java/appeng/client/gui/AEBaseMEGui.java b/src/main/java/appeng/client/gui/AEBaseMEGui.java
index 83d4ac6f3..3ddb83b28 100644
--- a/src/main/java/appeng/client/gui/AEBaseMEGui.java
+++ b/src/main/java/appeng/client/gui/AEBaseMEGui.java
@@ -21,6 +21,9 @@ package appeng.client.gui;
 
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.me.SlotME;
+import appeng.container.slot.AppEngSlot;
+import appeng.container.slot.SlotPlayerHotBar;
+import appeng.container.slot.SlotPlayerInv;
 import appeng.core.AEConfig;
 import appeng.core.localization.ButtonToolTips;
 import net.minecraft.inventory.Container;
@@ -43,11 +46,12 @@ public abstract class AEBaseMEGui extends AEBaseGui {
     protected void renderToolTip(final ItemStack stack, final int x, final int y) {
         final Slot s = this.getSlot(x, y);
 
+        final int bigNumber = AEConfig.instance().useTerminalUseLargeFont() ? 999 : 9999;
+        final List<String> currentToolTip = this.getItemToolTip(stack);
+
         if (s instanceof SlotME && !stack.isEmpty()) {
-            final int bigNumber = AEConfig.instance().useTerminalUseLargeFont() ? 999 : 9999;
 
             IAEItemStack myStack = null;
-            final List<String> currentToolTip = this.getItemToolTip(stack);
 
             try {
                 final SlotME theSlotField = (SlotME) s;
@@ -56,7 +60,7 @@ public abstract class AEBaseMEGui extends AEBaseGui {
             }
 
             if (myStack != null) {
-                if (myStack.getStackSize() > bigNumber || (myStack.getStackSize() > 1 && stack.isItemDamaged())) {
+                if (myStack.getStackSize() > 1) {
                     final String local = ButtonToolTips.ItemsStored.getLocal();
                     final String formattedAmount = NumberFormat.getNumberInstance(Locale.US).format(myStack.getStackSize());
                     final String format = String.format(local, formattedAmount);
@@ -86,6 +90,15 @@ public abstract class AEBaseMEGui extends AEBaseGui {
 
                 return;
             }
+        } else if (s instanceof AppEngSlot) {
+            if (!(s instanceof SlotPlayerInv) && !(s instanceof SlotPlayerHotBar)) {
+                if (!s.getStack().isEmpty()) {
+                    final String formattedAmount = NumberFormat.getNumberInstance(Locale.US).format(s.getStack().getCount());
+                    currentToolTip.add(TextFormatting.GRAY + formattedAmount);
+                    this.drawHoveringText(currentToolTip, x, y, this.fontRenderer);
+                    return;
+                }
+            }
         }
 
         super.renderToolTip(stack, x, y);
diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java
index a2bcae31f..5b1e146b6 100644
--- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java
+++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java
@@ -328,13 +328,13 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 
         for (int x = 0; x < this.craftingSlots.length; x++) {
             input[x] = this.craftingSlots[x].getStack();
-            if (!input[x].isEmpty() && input[x].getCount() + increase > input[x].getMaxStackSize()) {
+            if (!input[x].isEmpty() && input[x].getCount() + increase < 0) {
                 canIncreaseInputs = false;
             }
         }
         for (final OptionalSlotFake outputSlot : this.outputSlots) {
             final ItemStack out = outputSlot.getStack();
-            if (!out.isEmpty() && out.getCount() + increase > out.getMaxStackSize()) {
+            if (!out.isEmpty() && out.getCount() + increase < 0) {
                 canIncreaseOutputs = false;
             }
         }