diff --git a/src/api b/src/api
index bf650319d..06c9daf81 160000
--- a/src/api
+++ b/src/api
@@ -1 +1 @@
-Subproject commit bf650319da422790bff294d570dd879143fe8d4c
+Subproject commit 06c9daf81be8df0138a992ca6bcabc05e37189cb
diff --git a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityProjectile.java b/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityProjectile.java
index cce9bbe58..2ba840aec 100644
--- a/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityProjectile.java
+++ b/src/main/java/kamkeel/npcs/client/renderer/RenderAbilityProjectile.java
@@ -31,6 +31,7 @@ public abstract class RenderAbilityProjectile extends Render {
      */
     protected void setupRenderState() {
         GL11.glPushMatrix();
+        GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
         GL11.glDisable(GL11.GL_CULL_FACE);
         GL11.glEnable(GL12.GL_RESCALE_NORMAL);
         GL11.glEnable(GL11.GL_ALPHA_TEST);
@@ -48,9 +49,7 @@ public abstract class RenderAbilityProjectile extends Render {
      * Restore GL state after rendering.
      */
     protected void restoreRenderState() {
-        GL11.glEnable(GL11.GL_TEXTURE_2D);
-        GL11.glEnable(GL11.GL_LIGHTING);
-        GL11.glEnable(GL11.GL_CULL_FACE);
+        GL11.glPopAttrib();
         GL11.glPopMatrix();
     }
 
diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBeamRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBeamRenderer.java
index 64b37340f..7f9fdd19b 100644
--- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBeamRenderer.java
+++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBeamRenderer.java
@@ -26,8 +26,8 @@ public class BlockBeamRenderer extends BlockRendererInterface {
     public void renderTileEntityAt(TileEntity var1, double var2, double var4,
                                    double var6, float var8) {
         TileVariant tile = (TileVariant) var1;
-        GL11.glDisable(GL12.GL_RESCALE_NORMAL);
         GL11.glPushMatrix();
+        GL11.glDisable(GL12.GL_RESCALE_NORMAL);
         GL11.glTranslatef((float) var2 + 0.5f, (float) var4 + 1.5f, (float) var6 + 0.5f);
         //GL11.glScalef(1.2f, 1.1f, 1.2f);
         GL11.glRotatef(180, 0, 0, 1);