diff --git a/fml/client/cpw/mods/fml/client/FMLClientHandler.java b/fml/client/cpw/mods/fml/client/FMLClientHandler.java
index 3261f09453..c9d4934594 100644
--- a/fml/client/cpw/mods/fml/client/FMLClientHandler.java
+++ b/fml/client/cpw/mods/fml/client/FMLClientHandler.java
@@ -124,7 +124,7 @@ public class FMLClientHandler implements IFMLSidedHandler
 
     private ModSortingException modSorting;
 
-    private boolean loading;
+    private boolean loading = true;
 
     private WrongMinecraftVersionException wrongMC;
 
@@ -160,7 +160,6 @@ public class FMLClientHandler implements IFMLSidedHandler
             return;
         }
 
-        loading = true;
 //        TextureFXManager.instance().setClient(client);
         FMLCommonHandler.instance().beginLoading(this);
         new ModLoaderClientHelper(client);
diff --git a/fml/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java b/fml/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java
index a3fb6a4ae9..906d02d716 100644
--- a/fml/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java
+++ b/fml/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the GNU Lesser Public License v2.1
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * 
+ *
  * Contributors:
  *     cpw - implementation
  */
@@ -172,6 +172,10 @@ public class KeyBindingRegistry
 
     private Set<KeyHandler> keyHandlers = Sets.newLinkedHashSet();
 
+    /**
+     * Deprecated as it should not be used by client code
+     * @return
+     */
     @Deprecated
     public static KeyBindingRegistry instance()
     {