diff --git a/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java b/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java
index 4fcc5d8..4e2513c 100644
--- a/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java
+++ b/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java
@@ -180,7 +180,12 @@ public class GuiConfig extends GuiScreen {
                 drawKeyValues();
             } else {
                 Logger.info("keyTyped(c,i)", "Trying to close inventory with esc.");
-                super.keyTyped(character, keyCode); // Enable standard gui closing
+
+                try {
+                    super.keyTyped(character, keyCode); // Enable standard gui closing
+                } catch (Exception ignored) {
+                    // support for newer versions, just do nothing
+                }
             }
 
         } else if (selectedButtonID != -1) {
@@ -193,8 +198,6 @@ public class GuiConfig extends GuiScreen {
 
     }
 
-    // TODO: Crafting symbols & labels
-
     private void drawCraftingTable() {
         GL11.glColor4f(1F, 1F, 1F, 1F);
         mc.renderEngine.bindTexture(new ResourceLocation("textures/gui/container/crafting_table.png"));
@@ -243,7 +246,7 @@ public class GuiConfig extends GuiScreen {
         drawTexturedModalRect(guiShowBasePosX + 105, guiShowBasePosY + 17, 150, 50, 50, 50);
 
         drawInfoString(1, 32, 51);
-        // TODO: 1.8 Enchantment Table
+        // 1.8 drawInfoString(2, 42, 51);
     }
 
 
diff --git a/src/main/java/de/skate702/craftingkeys/manager/EnchantmentManager.java b/src/main/java/de/skate702/craftingkeys/manager/EnchantmentManager.java
index f935337..5ac701d 100644
--- a/src/main/java/de/skate702/craftingkeys/manager/EnchantmentManager.java
+++ b/src/main/java/de/skate702/craftingkeys/manager/EnchantmentManager.java
@@ -37,14 +37,14 @@ public class EnchantmentManager extends ContainerManager {
     @Override
     protected int specificKeyToSlotIndex() {
         return mapKeyToSlot(-1, 0, -1, -1, 0, -1, -1, -1, -1);
-        // return mapKeyToSlot(-1, 0, 1, -1, 0, 1, -1, -1, -1);
+        // 1.8 return mapKeyToSlot(-1, 0, 1, -1, 0, 1, -1, -1, -1);
 
     }
 
     @Override
     protected int getInventoryStartIndex() {
         return 1;
-        // return 2;
+        // 1.8 return 2;
     }
 
     @Override
@@ -55,7 +55,7 @@ public class EnchantmentManager extends ContainerManager {
     @Override
     protected int[] getDropSlots() {
         return new int[]{0};
-        // return new int[] {0, 1};
+        // 1.8 return new int[] {0, 1};
     }
 
     @Override
diff --git a/src/main/java/de/skate702/craftingkeys/manager/InventoryManager.java b/src/main/java/de/skate702/craftingkeys/manager/InventoryManager.java
index 45a1de1..2cdc779 100644
--- a/src/main/java/de/skate702/craftingkeys/manager/InventoryManager.java
+++ b/src/main/java/de/skate702/craftingkeys/manager/InventoryManager.java
@@ -45,8 +45,6 @@ public class InventoryManager extends ContainerManager {
         return 9;
     }
 
-    // TODO: 1.8 Fix inventory slot bug
-
     @Override
     protected int getInteractionSlotIndex() {
         return 0;