diff --git a/proposal/mutant/build/ant1compat.xml b/proposal/mutant/build/ant1compat.xml
index 6dec453d0..84b11ae99 100644
--- a/proposal/mutant/build/ant1compat.xml
+++ b/proposal/mutant/build/ant1compat.xml
@@ -96,7 +96,7 @@
              unless="jdk1.2+" />
     <!-- uses the context classloader -->
     <exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
-             />
+             unless="jdk1.2+" />
   </patternset>
   <patternset id="needs.jdk1.3+">
     <exclude name="${ant.package}/taskdefs/TestProcess.java"
@@ -175,15 +175,7 @@
   <patternset id="needs.jakarta.bcel">
     <exclude name="${ant.package}/filters/util/JavaClassHelper.java" 
              unless="bcel.present" />
-    <exclude name="${optional.type.package}/depend/*.java" 
-             unless="bcel.present" />
-    <exclude name="${util.package}/depend/*.java"
-             unless="bcel.present" />
-    <exclude name="${optional.package}/ejb/EjbJar.java"
-             unless="bcel.present" />
-    <exclude name="${optional.package}/ejb/*DeploymentTool.java"
-             unless="bcel.present" />
-    <exclude name="${optional.package}/ejb/IPlanet*.java"
+    <exclude name="${util.package}/depend/bcel/*.java"
              unless="bcel.present" />
   </patternset>
   <patternset id="needs.jakarta.log4j">
diff --git a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java b/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
index f2d819f19..061f796e5 100644
--- a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
+++ b/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
@@ -129,6 +129,7 @@ public class Builder {
         files.add(new File(UTIL_ROOT, "IdentityMapper.java"));
         files.add(new File(UTIL_ROOT, "MergingMapper.java"));
         files.add(new File(UTIL_ROOT, "GlobPatternMapper.java"));
+        files.add(new File(UTIL_ROOT, "LoaderUtils.java"));
         files.add(new File(UTIL_ROOT, "regexp/Regexp.java"));
         files.add(new File(UTIL_ROOT, "regexp/RegexpMatcher.java"));
         files.add(new File(UTIL_ROOT, "regexp/RegexpFactory.java"));