diff --git a/src/etc/testcases/core/containersrc/test/SpecialSeq.java b/src/etc/testcases/core/containersrc/test/SpecialSeq.java
index f3f017601..d823732ec 100644
--- a/src/etc/testcases/core/containersrc/test/SpecialSeq.java
+++ b/src/etc/testcases/core/containersrc/test/SpecialSeq.java
@@ -23,12 +23,11 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.taskdefs.Echo;
 
-import java.util.Enumeration;
 import java.util.Vector;
 
 public class SpecialSeq extends Task implements TaskContainer {
     /** Optional Vector holding the nested tasks */
-    private Vector nestedTasks = new Vector();
+    private Vector<Task> nestedTasks = new Vector<>();
 
     private FileSet fileset;
 
@@ -50,10 +49,7 @@ public class SpecialSeq extends Task implements TaskContainer {
         if (fileset == null || fileset.getDir(getProject()) == null) {
             throw new BuildException("Fileset was not configured");
         }
-        for (Enumeration e = nestedTasks.elements(); e.hasMoreElements();) {
-            Task nestedTask = (Task) e.nextElement();
-            nestedTask.perform();
-        }
+        nestedTasks.forEach(Task::perform);
         nestedEcho.reconfigure();
         nestedEcho.perform();
     }
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
index 8f0d13dd3..175a39a7a 100644
--- a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
+++ b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
@@ -403,8 +403,8 @@ public class ProjectHelperImpl extends ProjectHelper {
                         baseDir = value;
                         break;
                     default:
-                        throw new SAXParseException("Unexpected attribute \"" + attrs.getName(i)
-                                        + "\"", helperImpl.locator);
+                        throw new SAXParseException("Unexpected attribute \"" + key + "\"",
+                                helperImpl.locator);
                 }
             }