diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud/gcloud.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud/gcloud.xml
index 19f79a1eba7..45daf215c1f 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud/gcloud.xml
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud/gcloud.xml
@@ -10,7 +10,7 @@
     <Arg><Ref refid="Server"/></Arg>
     <Arg>
       <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
-        <Arg><Property name="gcloud.addServerClasses"><Default>file:${jetty.base}/lib/gcloud</Default></Property></Arg>
+        <Arg><Property name="gcloud.addServerClasses"><Default>file:<Property name="jetty.base"/>/lib/gcloud</Default></Property></Arg>
       </Call>
     </Arg>
   </Call>
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java
index 92704f99e99..72fa3ce5d10 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java
@@ -808,6 +808,9 @@ public class GCloudSessionDataStore extends AbstractSessionDataStore
         {
             //need to assume that the problem is the index doesn't exist, because there
             //is no specific code for that
+            if (LOG.isDebugEnabled())
+                LOG.debug("Check for indexes", e);
+
             return false;
         }
     }
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java
index 1ff40983909..83da246afbe 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java
@@ -475,9 +475,6 @@ public class WebAppClassLoader extends URLClassLoader
     @Override
     protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException
     {
-        LOG.setDebugEnabled(true);
-        WebAppContext.LOG.setDebugEnabled(true);
-        
         synchronized (getClassLoadingLock(name))
         {            
             ClassNotFoundException ex= null;
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
index 5b2145f2015..c988aaa448c 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
@@ -1577,10 +1577,12 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
     /* ------------------------------------------------------------ */
     public static void addServerClasses(Server server,String... pattern )
     {
-        // look for a Server attribute with the list of Server classes
-        // to apply to every web application. If not present, use our defaults.
-        Object o = server.getAttribute(SERVER_SRV_CLASSES);
+        if (pattern == null || pattern.length == 0)
+            return;
         
+        // look for a Server attribute with the list of Server classes
+        // to apply to every web application. If not present, use our defaults.        
+        Object o = server.getAttribute(SERVER_SRV_CLASSES);
         if (o instanceof ClasspathPattern)
         {
             ((ClasspathPattern)o).add(pattern);
@@ -1601,10 +1603,12 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
     /* ------------------------------------------------------------ */
     public static void addSystemClasses(Server server,String... pattern )
     {
+        if (pattern == null || pattern.length == 0)
+            return;
+        
         // look for a Server attribute with the list of System classes
         // to apply to every web application. If not present, use our defaults.
         Object o = server.getAttribute(SERVER_SYS_CLASSES);
-        
         if (o instanceof ClasspathPattern)
         {
             ((ClasspathPattern)o).add(pattern);