diff --git a/fml/build.xml b/fml/build.xml
index 12e84a82b..84b7db19a 100644
--- a/fml/build.xml
+++ b/fml/build.xml
@@ -175,7 +175,7 @@
             </replacetokens>
           </filterchain>
         </concat>
-        <mergemapper to="fml/cpw/mods/fml/common/Loader.java" />
+        <mergemapper to="fml/src/minecraft_server/cpw/mods/fml/common/Loader.java" />
       </mappedresources>
       <mappedresources>
         <concat>
diff --git a/fml/common/cpw/mods/fml/common/IWorldGenerator.java b/fml/common/cpw/mods/fml/common/IWorldGenerator.java
index f787fee49..f8ae4de22 100644
--- a/fml/common/cpw/mods/fml/common/IWorldGenerator.java
+++ b/fml/common/cpw/mods/fml/common/IWorldGenerator.java
@@ -15,8 +15,6 @@ package cpw.mods.fml.common;
 
 import java.util.Random;
 
-import cpw.mods.fml.server.FMLServerHandler;
-
 /**
  * This is called back during world generation. The {@link #generate(Random, int, int, Object...)} method passes in some additional data that 
  * can be cast into minecraft objects.