diff --git a/bin/main/dev/resent/module/impl/hud/FPS.class b/bin/main/dev/resent/module/impl/hud/FPS.class
index 146b4661..c38d5e1b 100644
Binary files a/bin/main/dev/resent/module/impl/hud/FPS.class and b/bin/main/dev/resent/module/impl/hud/FPS.class differ
diff --git a/bin/main/dev/resent/module/impl/hud/Freelook.class b/bin/main/dev/resent/module/impl/hud/Freelook.class
index 13c2c324..9c82d91d 100644
Binary files a/bin/main/dev/resent/module/impl/hud/Freelook.class and b/bin/main/dev/resent/module/impl/hud/Freelook.class differ
diff --git a/bin/main/dev/resent/module/impl/hud/KeyStrokes.class b/bin/main/dev/resent/module/impl/hud/KeyStrokes.class
index 43472f30..871114b0 100644
Binary files a/bin/main/dev/resent/module/impl/hud/KeyStrokes.class and b/bin/main/dev/resent/module/impl/hud/KeyStrokes.class differ
diff --git a/bin/main/dev/resent/module/impl/hud/Watermark.class b/bin/main/dev/resent/module/impl/hud/Watermark.class
index d6002289..c80ad25e 100644
Binary files a/bin/main/dev/resent/module/impl/hud/Watermark.class and b/bin/main/dev/resent/module/impl/hud/Watermark.class differ
diff --git a/bin/main/dev/resent/module/impl/misc/ChunkBorders.class b/bin/main/dev/resent/module/impl/misc/ChunkBorders.class
index 6280e196..49820b9f 100644
Binary files a/bin/main/dev/resent/module/impl/misc/ChunkBorders.class and b/bin/main/dev/resent/module/impl/misc/ChunkBorders.class differ
diff --git a/bin/main/net/minecraft/client/Minecraft.class b/bin/main/net/minecraft/client/Minecraft.class
index 1f4c84e0..80e12c90 100644
Binary files a/bin/main/net/minecraft/client/Minecraft.class and b/bin/main/net/minecraft/client/Minecraft.class differ
diff --git a/src/main/java/dev/resent/module/impl/hud/Freelook.java b/src/main/java/dev/resent/module/impl/hud/Freelook.java
index 9a93a4db..96f9f57f 100644
--- a/src/main/java/dev/resent/module/impl/hud/Freelook.java
+++ b/src/main/java/dev/resent/module/impl/hud/Freelook.java
@@ -6,7 +6,7 @@ import dev.resent.event.impl.EventUpdate;
 import dev.resent.module.base.Category;
 import dev.resent.module.base.Mod;
 import dev.resent.util.misc.W;
-import net.lax1dude.eaglercraft.EaglerAdapter;
+import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.minecraft.client.Minecraft;
 
 @SuppressWarnings("all")
@@ -36,7 +36,7 @@ public class Freelook extends Mod {
                 mc.gameSettings.thirdPersonView = previousePrespective;
             }
 
-    if (EaglerAdapter.getEventKey() == 6 && mc.gameSettings.keyBindFunction.pressed) {
+    if (Keyboard.getEventKey() == 6 && mc.gameSettings.keyBindFunction.pressed) {
         perspectiveToggled = false;
     }
 }
diff --git a/src/main/java/dev/resent/module/impl/hud/KeyStrokes.java b/src/main/java/dev/resent/module/impl/hud/KeyStrokes.java
index 645c6c96..00b3bbd8 100644
--- a/src/main/java/dev/resent/module/impl/hud/KeyStrokes.java
+++ b/src/main/java/dev/resent/module/impl/hud/KeyStrokes.java
@@ -10,7 +10,7 @@ import dev.resent.setting.ModeSetting;
 import dev.resent.util.misc.FuncUtils;
 import dev.resent.util.render.RainbowUtil;
 import dev.resent.util.render.RenderUtils;
-import net.lax1dude.eaglercraft.EaglerAdapter;
+GlStateManager.popMatrix();
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 
diff --git a/src/main/java/dev/resent/module/impl/hud/Watermark.java b/src/main/java/dev/resent/module/impl/hud/Watermark.java
index 47169206..eeb155e0 100644
--- a/src/main/java/dev/resent/module/impl/hud/Watermark.java
+++ b/src/main/java/dev/resent/module/impl/hud/Watermark.java
@@ -4,7 +4,7 @@ import dev.resent.Resent;
 import dev.resent.module.base.Category;
 import dev.resent.module.base.RenderModule;
 import dev.resent.util.render.Color;
-import net.lax1dude.eaglercraft.EaglerAdapter;
+GlStateManager.popMatrix();
 import net.minecraft.src.FontRenderer;
 
 public class Watermark extends RenderModule{
diff --git a/src/main/java/dev/resent/module/impl/misc/ChunkBorders.java b/src/main/java/dev/resent/module/impl/misc/ChunkBorders.java
index d46e2235..8d826733 100644
--- a/src/main/java/dev/resent/module/impl/misc/ChunkBorders.java
+++ b/src/main/java/dev/resent/module/impl/misc/ChunkBorders.java
@@ -4,7 +4,7 @@ import dev.resent.Resent;
 import dev.resent.event.impl.RenderWorldEvent;
 import dev.resent.module.base.Category;
 import dev.resent.module.base.Mod;
-import net.lax1dude.eaglercraft.EaglerAdapter;
+GlStateManager.popMatrix();
 import net.minecraft.src.AxisAlignedBB;
 import net.minecraft.src.RenderGlobal;
 import net.minecraft.src.RenderManager;
diff --git a/src/main/java/dev/resent/ui/mods/GuiScreenModule.java b/src/main/java/dev/resent/ui/mods/GuiScreenModule.java
index f2f4ca58..d9ac0a3b 100644
--- a/src/main/java/dev/resent/ui/mods/GuiScreenModule.java
+++ b/src/main/java/dev/resent/ui/mods/GuiScreenModule.java
@@ -7,7 +7,7 @@ import dev.resent.module.base.Mod;
 import dev.resent.setting.BooleanSetting;
 import dev.resent.setting.Setting;
 import dev.resent.util.misc.Keyboard;
-import net.lax1dude.eaglercraft.EaglerAdapter;
+GlStateManager.popMatrix();
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.src.GuiButton;
diff --git a/src/main/java/dev/resent/ui/mods/Settings.java b/src/main/java/dev/resent/ui/mods/Settings.java
index 9dd6aea9..59a2f934 100644
--- a/src/main/java/dev/resent/ui/mods/Settings.java
+++ b/src/main/java/dev/resent/ui/mods/Settings.java
@@ -9,7 +9,7 @@ import dev.resent.setting.Setting;
 import dev.resent.util.misc.Keyboard;
 import dev.resent.util.render.Color;
 import dev.resent.util.render.RenderUtils;
-import net.lax1dude.eaglercraft.EaglerAdapter;
+GlStateManager.popMatrix();
 import net.minecraft.client.Minecraft;
 import net.minecraft.src.FontRenderer;
 import net.minecraft.client.gui.Gui;
diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java
index 76b216b4..f2654839 100644
--- a/src/main/java/net/minecraft/client/Minecraft.java
+++ b/src/main/java/net/minecraft/client/Minecraft.java
@@ -212,7 +212,7 @@ public class Minecraft implements IThreadListener {
 	public GameSettings gameSettings;
 	public MouseHelper mouseHelper;
 	private final String launchedVersion;
-	private static int debugFPS;
+	public static int debugFPS;
 	private int rightClickDelayTimer;
 	private String serverName;
 	private int serverPort;