diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
index b1a3069f9..d06fbf511 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
@@ -202,6 +202,7 @@ public class JJTree extends Task {
         final Path classpath = cmdl.createClasspath(project);
         classpath.createPathElement().setPath(javaccHome.getAbsolutePath() +
                                                   "/JavaCC.zip");
+        classpath.addJavaRuntime();
 
         final Commandline.Argument arg = cmdl.createVmArgument();
         arg.setValue("-mx140M");
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
index 37ef2b550..fc9b461ec 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
@@ -245,6 +245,7 @@ public class JavaCC extends Task {
         final Path classpath = cmdl.createClasspath(project);
         classpath.createPathElement().setPath(javaccHome.getAbsolutePath() +
                                                   "/JavaCC.zip");
+        classpath.addJavaRuntime();
 
         final Commandline.Argument arg = cmdl.createVmArgument();
         arg.setValue("-mx140M");
diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java
index f282ba50a..d37bfc912 100644
--- a/src/main/org/apache/tools/ant/util/FileUtils.java
+++ b/src/main/org/apache/tools/ant/util/FileUtils.java
@@ -496,10 +496,14 @@ public class FileUtils {
     public File createTempFile(String prefix, String suffix, File parentDir) {
 
         File result = null;
+        String parent = null;
+        if (parentDir != null) {
+            parent = parentDir.getPath();
+        }
         DecimalFormat fmt = new DecimalFormat("#####");
         synchronized (rand) {
             do {
-                result = new File(parentDir, 
+                result = new File(parent, 
                                   prefix + fmt.format(rand.nextInt()) 
                                   + suffix);
             } while (result.exists());