diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java
index 5b96ce39..a1e0f9c2 100644
--- a/src/main/java/tconstruct/TConstruct.java
+++ b/src/main/java/tconstruct/TConstruct.java
@@ -138,7 +138,7 @@ public class TConstruct
         GameRegistry.registerWorldGenerator(new TBaseWorldGenerator(), 0);
         MinecraftForge.TERRAIN_GEN_BUS.register(new TerrainGenEventHandler());
         GameRegistry.registerFuelHandler(content);
-        MinecraftForge.EVENT_BUS.register(new TCraftingHandler());
+        FMLCommonHandler.instance().bus().register(new TCraftingHandler());
         NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy);
 
         if (PHConstruct.addToVillages)
diff --git a/src/main/java/tconstruct/achievements/TAchievements.java b/src/main/java/tconstruct/achievements/TAchievements.java
index 1bee7609..8c4e84c9 100644
--- a/src/main/java/tconstruct/achievements/TAchievements.java
+++ b/src/main/java/tconstruct/achievements/TAchievements.java
@@ -17,11 +17,11 @@ public class TAchievements
 
     public static void init ()
     {
-        Achievement[] achs = new Achievement[achievements.values().size()];
+        Achievement[] achs = achievements.values().toArray(new Achievement[0]);
 
-        for (int i = 0; i < achs.length; i++)
+        for (Achievement a : achs)
         {
-            achs[i] = (Achievement) achievements.values().toArray()[i];
+            a.registerStat();
         }
 
         achievementPage = new AchievementPage(StatCollector.translateToLocal("tconstruct.achievementPage.name"), achs);