diff --git a/src/org/labkey/test/Locator.java b/src/org/labkey/test/Locator.java
index 1a6e1e46bc..4c46a35f04 100644
--- a/src/org/labkey/test/Locator.java
+++ b/src/org/labkey/test/Locator.java
@@ -939,7 +939,7 @@ public static String xq(String value)
 
     public static String cq(String value)
     {
-        return "\"" + value.replace("\\\\", "\\\\\\\\").replace("\"", "\\\\\"") + "\"";
+        return "\"" + value.replace("\\", "\\\\").replace("\"", "\\\"") + "\"";
     }
 
     private static class XPathCSSLocator extends XPathLocator
diff --git a/src/org/labkey/test/WebDriverWrapper.java b/src/org/labkey/test/WebDriverWrapper.java
index 496b6701eb..ca9355593c 100644
--- a/src/org/labkey/test/WebDriverWrapper.java
+++ b/src/org/labkey/test/WebDriverWrapper.java
@@ -1800,7 +1800,7 @@ private void waitForPageToLoad(WebElement toBeStale, int millis)
                     {
                         return false;
                     }
-                }), "App didn't seem to load. No visible content. " + app.toString(), 5000);
+                }), "App didn't seem to load. No visible content. " + app.toString(), 10000);
         }
         mouseOut();
         _testTimeout = false;
diff --git a/src/org/labkey/test/util/Crawler.java b/src/org/labkey/test/util/Crawler.java
index e330a36176..86865b621f 100644
--- a/src/org/labkey/test/util/Crawler.java
+++ b/src/org/labkey/test/util/Crawler.java
@@ -26,7 +26,6 @@
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.ExtraSiteWrapper;
 import org.labkey.test.Locator;
-import org.labkey.test.Locators;
 import org.labkey.test.TestProperties;
 import org.labkey.test.WebDriverWrapper;
 import org.labkey.test.WebTestHelper;
@@ -1311,7 +1310,7 @@ private void testInjection(URL start)
             }
             catch (Exception ex)
             {
-                throw new AssertionError("Injection error from " + actionId.toString() + "\n" +
+                throw new AssertionError("Non-injection error while attempting script injection on " + actionId.toString() + "\n" +
                         "param: " + paramMalicious + "\n" +
                         "URL: " + urlMalicious, ex);
             }