diff --git a/java/server/src/org/openqa/grid/internal/utils/GridHubConfiguration.java b/java/server/src/org/openqa/grid/internal/utils/GridHubConfiguration.java
index d2e04aa243cd2..5629bcef5c4a1 100644
--- a/java/server/src/org/openqa/grid/internal/utils/GridHubConfiguration.java
+++ b/java/server/src/org/openqa/grid/internal/utils/GridHubConfiguration.java
@@ -398,6 +398,7 @@ public void setPort(int port) {
 
   public void setCleanupCycle(int cleanupCycle) {
     this.cleanupCycle = cleanupCycle;
+    put(RegistrationRequest.CLEAN_UP_CYCLE, cleanupCycle);
   }
 
   public void setTimeout(int timeout) {
diff --git a/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java b/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java
index 6e5fb78244cb1..70446f094052f 100644
--- a/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java
+++ b/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java
@@ -88,12 +88,12 @@ public void beforeRelease(TestSession session) {
 
 
   public void afterCommand(TestSession session, HttpServletRequest request, HttpServletResponse response) {
-    session.put("lastCommand", request.getMethod() + " - " + request.getPathInfo() + " executing ...");
+    session.put("lastCommand", request.getMethod() + " - " + request.getPathInfo() + " executed.");
   }
 
 
   public void beforeCommand(TestSession session, HttpServletRequest request, HttpServletResponse response) {
-    session.put("lastCommand", request.getMethod() + " - " + request.getPathInfo() + " executed.");
+    session.put("lastCommand", request.getMethod() + " - " + request.getPathInfo() + " executing ...");
   }
 
   private final HtmlRenderer renderer = new WebProxyHtmlRenderer(this);