diff --git a/fml/build.xml b/fml/build.xml
index 6997aca9c..7ba91c6b5 100644
--- a/fml/build.xml
+++ b/fml/build.xml
@@ -140,8 +140,8 @@
     <mkdir dir="${basedir}/target" />
     <jar destfile="${basedir}/target/${universal.jarname}.zip" duplicate="preserve">
       <manifest>
-        <attribute name="Main-Class" value="net.minecraft.server.MinecraftServer"/>
-        <attribute name="Class-Path" value="minecraft_server.jar"/>
+        <attribute name="Main-Class" value="cpw.mods.fml.relauncher.ServerLaunchWrapper"/>
+        <attribute name="Class-Path" value="minecraft_server.jar:lib/guava-14.0-rc3.jar:lib/bcprov-jdk15on-148-src.zip:lib/asm-debug-all-4.1.jar:lib/scala-library.jar:lib/argo-3.2-src.jar"/>
       </manifest>
       <fileset dir="${client.mcp.obfoutput}" includes="**/*.class" excludes="*.class"/>
     </jar>
diff --git a/fml/common/cpw/mods/fml/common/patcher/ClassPatch.java b/fml/common/cpw/mods/fml/common/patcher/ClassPatch.java
index e44340d88..d5d6e7ff6 100644
--- a/fml/common/cpw/mods/fml/common/patcher/ClassPatch.java
+++ b/fml/common/cpw/mods/fml/common/patcher/ClassPatch.java
@@ -14,4 +14,10 @@ public class ClassPatch {
         this.existsAtTarget = existsAtTarget;
         this.patch = patch;
     }
+
+    @Override
+    public String toString()
+    {
+        return String.format("%s : %s => %s (%b) size %d", name, sourceClassName, targetClassName, existsAtTarget, patch.length);
+    }
 }
diff --git a/fml/common/cpw/mods/fml/common/patcher/ClassPatchManager.java b/fml/common/cpw/mods/fml/common/patcher/ClassPatchManager.java
index c3480e969..56c0b05b7 100644
--- a/fml/common/cpw/mods/fml/common/patcher/ClassPatchManager.java
+++ b/fml/common/cpw/mods/fml/common/patcher/ClassPatchManager.java
@@ -105,9 +105,10 @@ public class ClassPatchManager {
             input.readFully(patchBytes);
 
             ClassPatch cp = new ClassPatch(name, sourceClassName, targetClassName, exists, patchBytes);
-            patches.put(name, cp);
+            patches.put(sourceClassName, cp);
         }
 
         FMLLog.fine("Read %d binary patches from %s", patches.size(), dirToScan.getAbsolutePath());
+        FMLLog.fine("Patch list : %s", patches);
     }
 }
diff --git a/fml/common/cpw/mods/fml/relauncher/FMLRelaunchLog.java b/fml/common/cpw/mods/fml/relauncher/FMLRelaunchLog.java
index 0663a0b17..1b4daec93 100644
--- a/fml/common/cpw/mods/fml/relauncher/FMLRelaunchLog.java
+++ b/fml/common/cpw/mods/fml/relauncher/FMLRelaunchLog.java
@@ -28,6 +28,8 @@ import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
+import com.google.common.base.Throwables;
+
 public class FMLRelaunchLog
 {
 
@@ -180,8 +182,9 @@ public class FMLRelaunchLog
                 }
             };
         }
-        catch (Exception e)
+        catch (Throwable t)
         {
+            throw Throwables.propagate(t);
         }
 
         resetLoggingHandlers();
diff --git a/fml/common/cpw/mods/fml/relauncher/FMLRelauncher.java b/fml/common/cpw/mods/fml/relauncher/FMLRelauncher.java
index 599706a91..9847462d6 100644
--- a/fml/common/cpw/mods/fml/relauncher/FMLRelauncher.java
+++ b/fml/common/cpw/mods/fml/relauncher/FMLRelauncher.java
@@ -24,7 +24,7 @@ public class FMLRelauncher
 {
     private static FMLRelauncher INSTANCE;
     public static String logFileNamePattern;
-    private static String side;
+    static String side;
     private RelaunchClassLoader classLoader;
     private Object newApplet;
     private Class<? super Object> appletClass;
diff --git a/fml/common/cpw/mods/fml/relauncher/LaunchWrapper.java b/fml/common/cpw/mods/fml/relauncher/ServerLaunchWrapper.java
similarity index 95%
rename from fml/common/cpw/mods/fml/relauncher/LaunchWrapper.java
rename to fml/common/cpw/mods/fml/relauncher/ServerLaunchWrapper.java
index b224b2ed8..92bcc42ea 100644
--- a/fml/common/cpw/mods/fml/relauncher/LaunchWrapper.java
+++ b/fml/common/cpw/mods/fml/relauncher/ServerLaunchWrapper.java
@@ -6,17 +6,17 @@ import java.util.logging.Level;
 
 import com.google.common.base.Throwables;
 
-public class LaunchWrapper {
+public class ServerLaunchWrapper {
 
     /**
      * @param args
      */
     public static void main(String[] args)
     {
-        new LaunchWrapper().run(args);
+        new ServerLaunchWrapper().run(args);
     }
 
-    private LaunchWrapper()
+    private ServerLaunchWrapper()
     {
 
     }