diff --git a/src/main/scala/li/cil/oc/client/gui/Case.scala b/src/main/scala/li/cil/oc/client/gui/Case.scala
index 7e708c28a..56bdea513 100644
--- a/src/main/scala/li/cil/oc/client/gui/Case.scala
+++ b/src/main/scala/li/cil/oc/client/gui/Case.scala
@@ -34,7 +34,7 @@ class Case(playerInventory: InventoryPlayer, val computer: tileentity.Case) exte
 
   override def drawGuiContainerForegroundLayer(mouseX: Int, mouseY: Int) = {
     super.drawGuiContainerForegroundLayer(mouseX, mouseY)
-    GL11.glPushAttrib(0xFFFFFFFF) // Me lazy... prevents NEI render glitch.
+    GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS) // Me lazy... prevents NEI render glitch.
     fontRenderer.drawString(
       StatCollector.translateToLocal(computer.getInvName),
       8, 6, 0x404040)
diff --git a/src/main/scala/li/cil/oc/client/gui/Rack.scala b/src/main/scala/li/cil/oc/client/gui/Rack.scala
index 9539614bf..7a6853c83 100644
--- a/src/main/scala/li/cil/oc/client/gui/Rack.scala
+++ b/src/main/scala/li/cil/oc/client/gui/Rack.scala
@@ -85,7 +85,7 @@ class Rack(playerInventory: InventoryPlayer, val rack: tileentity.Rack) extends
 
   override def drawGuiContainerForegroundLayer(mouseX: Int, mouseY: Int) = {
     super.drawGuiContainerForegroundLayer(mouseX, mouseY)
-    GL11.glPushAttrib(0xFFFFFFFF) // Prevents NEI render glitch.
+    GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS) // Prevents NEI render glitch.
 
     fontRenderer.drawString(
       StatCollector.translateToLocal(rack.getInvName),
diff --git a/src/main/scala/li/cil/oc/client/gui/Robot.scala b/src/main/scala/li/cil/oc/client/gui/Robot.scala
index d8e11c271..025e9300f 100644
--- a/src/main/scala/li/cil/oc/client/gui/Robot.scala
+++ b/src/main/scala/li/cil/oc/client/gui/Robot.scala
@@ -139,7 +139,7 @@ class Robot(playerInventory: InventoryPlayer, val robot: tileentity.Robot) exten
 
   protected override def drawGuiContainerForegroundLayer(mouseX: Int, mouseY: Int) {
     drawBufferLayer()
-    GL11.glPushAttrib(0xFFFFFFFF) // Me lazy... prevents NEI render glitch.
+    GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS) // Me lazy... prevents NEI render glitch.
     if (isPointInRegion(powerX, powerY, powerWidth, powerHeight, mouseX, mouseY)) {
       val tooltip = new java.util.ArrayList[String]
       val format = StatCollector.translateToLocal(Settings.namespace + "gui.Robot.Power") + ": %d%% (%d/%d)"
diff --git a/src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala b/src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala
index 70dc88089..cb8730bde 100644
--- a/src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala
+++ b/src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala
@@ -70,7 +70,7 @@ class RobotAssembler(playerInventory: InventoryPlayer, val assembler: tileentity
   }
 
   override def drawGuiContainerForegroundLayer(mouseX: Int, mouseY: Int) = {
-    GL11.glPushAttrib(0xFFFFFFFF) // Me lazy... prevents NEI render glitch.
+    GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS) // Me lazy... prevents NEI render glitch.
     if (!assemblerContainer.isAssembling) {
       def drawMessage(message: String) {
         fontRenderer.drawString(
diff --git a/src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala
index 9e7eb7ff6..e65233085 100644
--- a/src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala
@@ -22,7 +22,7 @@ object WirelessNetworkDebugRenderer {
           val py = player.lastTickPosY + (player.posY - player.lastTickPosY) * e.partialTicks
           val pz = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * e.partialTicks
 
-          GL11.glPushAttrib(0xFFFFFFFF)
+          GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
           GL11.glPushMatrix()
           GL11.glTranslated(-px, -py, -pz)
           RenderState.makeItBlend()
diff --git a/src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
index 6ae5bb3c3..eaff6975e 100644
--- a/src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
@@ -194,7 +194,7 @@ object BlockRenderer extends ISimpleBlockRenderingHandler {
     renderFaceZPos(block, metadata, renderer)
     renderFaceZNeg(block, metadata, renderer)
 
-    GL11.glPushAttrib(0xFFFFFF)
+    GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
     RenderState.makeItBlend()
     RenderState.disableLighting()
 
diff --git a/src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
index c547d0c75..ca9f8b543 100644
--- a/src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
@@ -70,6 +70,7 @@ object ItemRenderer extends IItemRenderer {
       val res = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight)
       val fontRenderer = renderItem.getFontRendererFromRenderManager
       if (fontRenderer != null && res.getScaleFactor > 1) {
+        GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
         GL11.glPushMatrix()
         GL11.glTranslatef(4f + 2f / res.getScaleFactor, 9f + 2f / res.getScaleFactor, 0)
         GL11.glScalef(1f / res.getScaleFactor, 1f / res.getScaleFactor, 1f)
@@ -85,6 +86,7 @@ object ItemRenderer extends IItemRenderer {
           GL11.glTranslatef(0, fontRenderer.FONT_HEIGHT, 0)
         }
         GL11.glPopMatrix()
+        GL11.glPopAttrib()
       }
     }
   }
diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/CaseRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/CaseRenderer.scala
index 25b49ae16..b93f377e3 100644
--- a/src/main/scala/li/cil/oc/client/renderer/tileentity/CaseRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/CaseRenderer.scala
@@ -13,7 +13,7 @@ object CaseRenderer extends TileEntitySpecialRenderer {
   override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) {
     val computer = tileEntity.asInstanceOf[Case]
     if (computer.isRunning) {
-      GL11.glPushAttrib(0xFFFFFF)
+      GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
 
       RenderState.disableLighting()
       RenderState.makeItBlend()
diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/ChargerRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/ChargerRenderer.scala
index 530a2f50d..7313952db 100644
--- a/src/main/scala/li/cil/oc/client/renderer/tileentity/ChargerRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/ChargerRenderer.scala
@@ -14,7 +14,7 @@ object ChargerRenderer extends TileEntitySpecialRenderer {
   override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) {
     val charger = tileEntity.asInstanceOf[Charger]
     if (charger.chargeSpeed > 0) {
-      GL11.glPushAttrib(0xFFFFFF)
+      GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
 
       RenderState.disableLighting()
       RenderState.makeItBlend()
diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/DisassemblerRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/DisassemblerRenderer.scala
index 4132b081b..6f789ea58 100644
--- a/src/main/scala/li/cil/oc/client/renderer/tileentity/DisassemblerRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/DisassemblerRenderer.scala
@@ -13,7 +13,7 @@ object DisassemblerRenderer extends TileEntitySpecialRenderer {
   override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) {
     val disassembler = tileEntity.asInstanceOf[tileentity.Disassembler]
     if (disassembler.isActive) {
-      GL11.glPushAttrib(0xFFFFFF)
+      GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
 
       RenderState.disableLighting()
       RenderState.makeItBlend()
diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/GeolyzerRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/GeolyzerRenderer.scala
index 840475dbe..98e09ad6e 100644
--- a/src/main/scala/li/cil/oc/client/renderer/tileentity/GeolyzerRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/GeolyzerRenderer.scala
@@ -10,7 +10,7 @@ import li.cil.oc.client.Textures
 
 object GeolyzerRenderer extends TileEntitySpecialRenderer {
   override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) {
-    GL11.glPushAttrib(0xFFFFFF)
+    GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
 
     RenderState.disableLighting()
     RenderState.makeItBlend()
diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala
index 3bdb5e46e..cb1a2e567 100644
--- a/src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala
@@ -31,7 +31,7 @@ object HologramRenderer extends TileEntitySpecialRenderer with Callable[Int] wit
     hologram = te.asInstanceOf[Hologram]
     if (!hologram.hasPower) return
 
-    GL11.glPushAttrib(0xFFFFFFFF)
+    GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
     RenderState.makeItBlend()
     GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE)
 
diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/PowerDistributorRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/PowerDistributorRenderer.scala
index baa5259dd..bc6031a96 100644
--- a/src/main/scala/li/cil/oc/client/renderer/tileentity/PowerDistributorRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/PowerDistributorRenderer.scala
@@ -13,7 +13,7 @@ object PowerDistributorRenderer extends TileEntitySpecialRenderer {
   override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) {
     val distributor = tileEntity.asInstanceOf[tileentity.PowerDistributor]
     if (distributor.globalBuffer > 0) {
-      GL11.glPushAttrib(0xFFFFFF)
+      GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
 
       RenderState.disableLighting()
       RenderState.makeItBlend()
diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/RackRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/RackRenderer.scala
index 8047482bd..231729e25 100644
--- a/src/main/scala/li/cil/oc/client/renderer/tileentity/RackRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/RackRenderer.scala
@@ -13,7 +13,7 @@ object RackRenderer extends TileEntitySpecialRenderer {
   override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) = {
     val rack = tileEntity.asInstanceOf[Rack]
     if (rack.anyRunning) {
-      GL11.glPushAttrib(0xFFFFFF)
+      GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
 
       RenderState.disableLighting()
       RenderState.makeItBlend()
diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotAssemblerRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotAssemblerRenderer.scala
index 0cc973e8d..ebcff1225 100644
--- a/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotAssemblerRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotAssemblerRenderer.scala
@@ -13,7 +13,7 @@ object RobotAssemblerRenderer extends TileEntitySpecialRenderer {
   override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) {
     val assembler = tileEntity.asInstanceOf[RobotAssembler]
 
-    GL11.glPushAttrib(0xFFFFFF)
+    GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
 
     RenderState.disableLighting()
     RenderState.makeItBlend()
diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/RouterRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/RouterRenderer.scala
index 292049014..94d3e1e25 100644
--- a/src/main/scala/li/cil/oc/client/renderer/tileentity/RouterRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/RouterRenderer.scala
@@ -14,7 +14,7 @@ object RouterRenderer extends TileEntitySpecialRenderer {
     val router = tileEntity.asInstanceOf[tileentity.Router]
     val activity = math.max(0, 1 - (System.currentTimeMillis() - router.lastMessage) / 1000.0)
     if (activity > 0) {
-      GL11.glPushAttrib(0xFFFFFF)
+      GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
 
       RenderState.disableLighting()
       RenderState.makeItBlend()
diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
index 3d4f35c1a..bd3a2e241 100644
--- a/src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
@@ -44,7 +44,7 @@ object ScreenRenderer extends TileEntitySpecialRenderer {
       return
     }
 
-    GL11.glPushAttrib(0xFFFFFF)
+    GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
 
     RenderState.disableLighting()
     RenderState.makeItBlend()