diff --git a/lib/rhino.jar b/lib/rhino.jar
index 2369f99a..a8b9417a 100644
Binary files a/lib/rhino.jar and b/lib/rhino.jar differ
diff --git a/src/helma/framework/ResponseTrans.java b/src/helma/framework/ResponseTrans.java
index c049832d..46a0a2fa 100644
--- a/src/helma/framework/ResponseTrans.java
+++ b/src/helma/framework/ResponseTrans.java
@@ -26,6 +26,7 @@ import java.io.*;
 import java.security.*;
 import java.util.*;
 
+import helma.util.Base64;
 import org.apache.xmlrpc.XmlRpcResponseProcessor;
 
 /**
diff --git a/src/helma/scripting/rhino/PathWrapper.java b/src/helma/scripting/rhino/PathWrapper.java
index 7a86cab4..406c615f 100644
--- a/src/helma/scripting/rhino/PathWrapper.java
+++ b/src/helma/scripting/rhino/PathWrapper.java
@@ -35,7 +35,7 @@ public class PathWrapper extends ScriptableObject {
     /**
      * Zero arg constructor for creating the PathWrapper prototype.
      */
-    public PathWrapper (RhinoCore core) throws PropertyException, NoSuchMethodException {
+    public PathWrapper (RhinoCore core) throws RhinoException, NoSuchMethodException {
         this.core = core;
         // create a dummy path object
         this.path = new RequestPath(core.app);
diff --git a/src/helma/scripting/rhino/RhinoCore.java b/src/helma/scripting/rhino/RhinoCore.java
index 49cd229c..64b03425 100644
--- a/src/helma/scripting/rhino/RhinoCore.java
+++ b/src/helma/scripting/rhino/RhinoCore.java
@@ -89,8 +89,8 @@ public final class RhinoCore implements ScopeProvider {
     // optimization level for rhino engine, ranges from -1 to 9
     int optLevel = 0;
 
-    // language version - default to JS 1.7
-    int languageVersion = 170;
+    // language version - default to JS 1.8
+    int languageVersion = 180;
     
     // debugger/tracer flags
     boolean hasDebugger = false;
diff --git a/src/helma/servlet/AbstractServletClient.java b/src/helma/servlet/AbstractServletClient.java
index 3ec34709..6ba2360e 100644
--- a/src/helma/servlet/AbstractServletClient.java
+++ b/src/helma/servlet/AbstractServletClient.java
@@ -29,6 +29,7 @@ import java.security.NoSuchAlgorithmException;
 import javax.servlet.*;
 import javax.servlet.http.*;
 
+import helma.util.Base64;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.*;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;