diff --git a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
index 4221d74fa..8aac5e646 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
@@ -136,7 +136,7 @@ public class Tstamp extends Task {
                     if (st.hasMoreElements()) {
                         country = st.nextToken();
                         if (st.hasMoreElements()) {
-                            throw new BuildException( "bad locale format", location);
+                            throw new BuildException( "bad locale format", getLocation());
                         }
                     }
                 }
@@ -145,7 +145,7 @@ public class Tstamp extends Task {
                 }
             }
             catch (NoSuchElementException e) {
-                throw new BuildException( "bad locale format", e, location);
+                throw new BuildException( "bad locale format", e, getLocation());
             }
         }
         
@@ -179,7 +179,7 @@ public class Tstamp extends Task {
                 field = Calendar.YEAR;
             }
             else {
-                throw new BuildException(unit + " is not a unit supported by the tstamp task");
+                throw new BuildException(unit + " is not a unit supported by the tstamp task", getLocation());
             }
         }            
         
diff --git a/src/main/org/apache/tools/ant/types/PatternSet.java b/src/main/org/apache/tools/ant/types/PatternSet.java
index e36d1a4bb..4e3133ce7 100644
--- a/src/main/org/apache/tools/ant/types/PatternSet.java
+++ b/src/main/org/apache/tools/ant/types/PatternSet.java
@@ -413,7 +413,7 @@ public class PatternSet extends DataType {
                     readPatterns(inclFile, includeList, p);
                 }
             }
-            includesFileList.clear();
+            includesFileList.removeAllElements();
         }
 
         if (excludesFileList.size() > 0) {
@@ -430,7 +430,7 @@ public class PatternSet extends DataType {
                     readPatterns(exclFile, excludeList, p);
                 }
             }
-            excludesFileList.clear();
+            excludesFileList.removeAllElements();
         }
     }