diff --git a/Documentation/REST-API/API.md b/Documentation/REST-API/API.md
index 02ce8bec7..778914910 100644
--- a/Documentation/REST-API/API.md
+++ b/Documentation/REST-API/API.md
@@ -216,7 +216,7 @@ must be one of the methods that the requested resource supports.
 #### Allow
 
 All resources return the Allow header with the supported HTTP methods. For
-example the resource `/service` will always return the `Accept: GET, PATCH, PUT`
+example the resource `/services` will always return the `Accept: GET, PATCH, PUT`
 header.
 
 #### Accept-Patch
@@ -320,7 +320,7 @@ representation of the error.
 ```javascript
 {
     "error": {
-        "detail" : "The new `/server/` resource is missing the `port` parameter"
+        "detail" : "The new `/servers/` resource is missing the `port` parameter"
     }
 }
 ```
diff --git a/Documentation/REST-API/Resources-Server.md b/Documentation/REST-API/Resources-Server.md
index a7056c0b9..7bf0f1f1b 100644
--- a/Documentation/REST-API/Resources-Server.md
+++ b/Documentation/REST-API/Resources-Server.md
@@ -373,7 +373,7 @@ _server1_ from the service _RW-Split-Router_.
 Removing a service from a server is analogous to removing the server from the
 service. Both unlink the two objects from each other.
 
-Response to `GET /v1/server/server1`:
+Response to `GET /v1/servers/server1`:
 
 ```javascript
 {
@@ -439,7 +439,7 @@ Response to `GET /v1/server/server1`:
 }
 ```
 
-Request for `PUT /v1/server/server1`:
+Request for `PATCH /v1/servers/server1`:
 
 ```javascript
 {
diff --git a/maxscale-system-test/maxtest/src/testconnections.cpp b/maxscale-system-test/maxtest/src/testconnections.cpp
index 7fed092b3..337c0e2ee 100644
--- a/maxscale-system-test/maxtest/src/testconnections.cpp
+++ b/maxscale-system-test/maxtest/src/testconnections.cpp
@@ -577,13 +577,14 @@ TestConnections::~TestConnections()
         // galera->disable_ssl();
     }
 
+    // stop all Maxscales to detect crashes on exit
+    for (int i = 0; i < maxscales->N; i++)
+    {
+        stop_maxscale(i);
+    }
+
     if (maxscales->use_valgrind)
     {
-        // stop all Maxscales to get proper Valgrind logs
-        for (int i = 0; i < maxscales->N; i++)
-        {
-            stop_maxscale(i);
-        }
         sleep(15);      // sleep to let logs be written do disks
     }
 
diff --git a/maxscale-system-test/rwsplit_readonly_stress.cpp b/maxscale-system-test/rwsplit_readonly_stress.cpp
index e3771cc0b..e1c721888 100644
--- a/maxscale-system-test/rwsplit_readonly_stress.cpp
+++ b/maxscale-system-test/rwsplit_readonly_stress.cpp
@@ -102,6 +102,7 @@ int main(int argc, char* argv[])
     }
 
     Test->tprintf("Waiting for all threads to finish\n");
+    Test->set_timeout(60);
     running = 0;
 
     for (int i = 0; i < THREADS; i++)