diff --git a/build.xml b/build.xml
index e72f7744b..238e773bd 100644
--- a/build.xml
+++ b/build.xml
@@ -301,6 +301,10 @@
                unless="bcel.present" />
       <exclude name="${util.package}/depend/*.java"
                unless="bcel.present" />
+      <exclude name="${optional.type.package}/depend/*.java"
+               unless="jdk1.2+" />
+      <exclude name="${util.package}/depend/*.java"
+               unless="jdk1.2+" />
     </javac>
 
     <copy todir="${build.classes}">
diff --git a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
index 288824d72..3d0f6a930 100644
--- a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
+++ b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
@@ -884,7 +884,7 @@ public class FixCRLF extends MatchingTask {
                     if (i < line.length() - 1) {
                         // Trailing characters are ^Zs
                         // Construct new line and eofStr
-                        eofStr.append(line.substring(i + 1));
+                        eofStr.append(line.toString().substring(i + 1));
                         if (i < 0) {
                             line.setLength(0);
                             reachedEof = true;