diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ba7bd1d1872cef64d6acb89583ee1668f2ec872e..ce46e07bdf6cc3ea0d1657c6d6e312730d1fcfd1 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-27  Bryce McKinlay  <mckinlay@redhat.com>
+
+	* java/io/File.java (toURI): Throw RuntimeException, not 
+	InternalError.
+	* java/lang/Runtime.java (exit): Qualify static sleep() call with
+	class name, not instance.
+
 2004-07-24  Bryce McKinlay  <mckinlay@redhat.com>
 
 	* Makefile.am: Add gnu/java/security/action/GetPropertyAction.java
diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index 47f18b533b3d12ec9c5099c80ae999281f7323e0..1d930d59b84d0f20589eae836feedd8c9b80a10e 100644
--- a/libjava/java/io/File.java
+++ b/libjava/java/io/File.java
@@ -893,8 +893,7 @@ public class File implements Serializable, Comparable
     catch (URISyntaxException use)
       {
         // Can't happen.
-        throw (InternalError) new InternalError("Unconvertible file: "
-						+ this).initCause(use);
+	throw new RuntimeException(use);
       }
   }
 
diff --git a/libjava/java/lang/Runtime.java b/libjava/java/lang/Runtime.java
index e14cd192f402dfee128cba722a922aaa40d561cf..749aa36ac03245741e1d02522593facd87a3fb9b 100644
--- a/libjava/java/lang/Runtime.java
+++ b/libjava/java/lang/Runtime.java
@@ -238,7 +238,7 @@ public class Runtime
                       }
                 try
                   {
-                    exitSequence.sleep(1); // Give other threads a chance.
+                    Thread.sleep(1); // Give other threads a chance.
                   }
                 catch (InterruptedException e)
                   {