diff --git a/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java b/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
index eabe3139a8..e723dbb67b 100644
--- a/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
+++ b/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
@@ -37,7 +37,7 @@ public class AVMCrawlTestP extends AVMServiceTestBase
     {
         int n = 4;              // Number of Threads.
         int m = 12;             // How many multiples of content to start with.
-        long runTime = 7200000;  // 6 hours.
+        long runTime = 36000000;  // 6 hours.
         fService.purgeStore("main");
         BulkLoader loader = new BulkLoader();
         loader.setAvmService(fService);
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeService.java b/source/java/org/alfresco/repo/avm/AVMNodeService.java
index cc4469c87f..54387a687c 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeService.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodeService.java
@@ -854,7 +854,7 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
         {
             throw new InvalidNodeRefException("Read only store.", parentRef);
         }
-        Pair<Integer, String> childVersionPath = AVMNodeConverter.ToAVMVersionPath(parentRef);
+        Pair<Integer, String> childVersionPath = AVMNodeConverter.ToAVMVersionPath(childRef);
         if (childVersionPath.getFirst() >= 0)
         {
             throw new InvalidNodeRefException("Read only store.", childRef);
diff --git a/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java b/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java
index 709f55cd2e..cc35357fb2 100644
--- a/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java
+++ b/source/java/org/alfresco/repo/avm/actions/SimpleAVMSubmitAction.java
@@ -19,6 +19,7 @@ package org.alfresco.repo.avm.actions;
 
 import java.util.List;
 
+import org.alfresco.config.JNDIConstants;
 import org.alfresco.repo.action.executer.ActionExecuterAbstractBase;
 import org.alfresco.repo.avm.AVMDAOs;
 import org.alfresco.repo.avm.AVMNodeConverter;
@@ -138,7 +139,7 @@ public class SimpleAVMSubmitAction extends ActionExecuterAbstractBase
         // Cleanup by flattening the source relative to the destination.
         // This is an ugliness to prevent database write misorderings in flatten.
         AVMDAOs.Instance().fAVMNodeDAO.flush();
-        fAVMSyncService.flatten(storePath[0] + ":/appBase", websiteName + "-staging:/appBase");
+        fAVMSyncService.flatten(storePath[0] + ":/" + JNDIConstants.DIR_DEFAULT_WWW, websiteName + "-staging:/" + JNDIConstants.DIR_DEFAULT_WWW);
     }
 
     /**