diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index fa2822743f..65e3bfddff 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -154,7 +154,7 @@
     	    <ref bean="transactionComponent"/>
     	</property>
     	<property name="maxRetries">
-    	    <value>10</value>
+    	    <value>20</value>
     	</property>
     </bean>
 
@@ -184,7 +184,7 @@
             <ref bean="readWriteTransactionDefinition"/>
         </property>
         <property name="maxRetries">
-            <value>10</value>
+            <value>20</value>
         </property>
     </bean>
 
@@ -196,7 +196,7 @@
             <ref bean="readOnlyTransactionDefinition"/>
         </property>
         <property name="maxRetries">
-            <value>10</value>
+            <value>20</value>
         </property>
     </bean>
 
diff --git a/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java b/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
index bf3ac318d4..eabe3139a8 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 = 28800000;  // 6 hours.
+        long runTime = 7200000;  // 6 hours.
         fService.purgeStore("main");
         BulkLoader loader = new BulkLoader();
         loader.setAvmService(fService);
diff --git a/source/java/org/alfresco/repo/avm/AVMCrawler.java b/source/java/org/alfresco/repo/avm/AVMCrawler.java
index a3f64d6785..d31f776795 100644
--- a/source/java/org/alfresco/repo/avm/AVMCrawler.java
+++ b/source/java/org/alfresco/repo/avm/AVMCrawler.java
@@ -248,8 +248,8 @@ class AVMCrawler implements Runnable
     private String randomName()
     {
         char [] chars = new char[2];
-        chars[0] = (char)('a' + fRandom.nextInt(26));
-        chars[1] = (char)('a' + fRandom.nextInt(26));
+        chars[0] = (char)('a' + fRandom.nextInt(12));
+        chars[1] = (char)('a' + fRandom.nextInt(12));
         return new String(chars);
     }
     
diff --git a/source/java/org/alfresco/repo/avm/AVMRepository.java b/source/java/org/alfresco/repo/avm/AVMRepository.java
index 3a9e56d3e9..d1dbf3b66e 100644
--- a/source/java/org/alfresco/repo/avm/AVMRepository.java
+++ b/source/java/org/alfresco/repo/avm/AVMRepository.java
@@ -687,8 +687,8 @@ public class AVMRepository
             {
                 dstNode.setAncestor(child);
             }
-            dstDir.putChild(dstName, dstNode);
             dstDir.updateModTime();
+            dstDir.putChild(dstName, dstNode);
             if (child == null)
             {
                 dstNode.setAncestor(srcNode);
diff --git a/source/java/org/alfresco/repo/avm/AVMStoreImpl.java b/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
index accbe76685..81c33f88d9 100644
--- a/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
@@ -237,8 +237,8 @@ public class AVMStoreImpl implements AVMStore, Serializable
         {
             newDir.setAncestor(child);
         }
-        dir.putChild(name, newDir);
         dir.updateModTime();
+        dir.putChild(name, newDir);
     }
 
     /**
@@ -280,8 +280,8 @@ public class AVMStoreImpl implements AVMStore, Serializable
         {
             newDir.setAncestor(child);
         }
-        dir.putChild(name, newDir);
         dir.updateModTime();
+        dir.putChild(name, newDir);
         newDir.setVersionID(getNextVersionID());
     }
 
@@ -306,8 +306,8 @@ public class AVMStoreImpl implements AVMStore, Serializable
         }
         PlainFileNodeImpl file = new PlainFileNodeImpl(this);
         file.setVersionID(getNextVersionID());
-        dir.putChild(name, file);
         dir.updateModTime();
+        dir.putChild(name, file);
         if (child != null)
         {
             file.setAncestor(child);
@@ -341,8 +341,8 @@ public class AVMStoreImpl implements AVMStore, Serializable
         }
         PlainFileNodeImpl file = new PlainFileNodeImpl(this);
         file.setVersionID(getNextVersionID());
-        dir.putChild(name, file);
         dir.updateModTime();
+        dir.putChild(name, file);
         if (child != null)
         {
             file.setAncestor(child);
@@ -381,8 +381,8 @@ public class AVMStoreImpl implements AVMStore, Serializable
         {
             newFile.setAncestor(child);
         }
-        dir.putChild(name, newFile);
         dir.updateModTime();
+        dir.putChild(name, newFile);
         newFile.setVersionID(getNextVersionID());
     }
 
diff --git a/source/java/org/alfresco/repo/avm/ChildEntryImpl.java b/source/java/org/alfresco/repo/avm/ChildEntryImpl.java
index 89d8fa16a1..2b2c2c71a4 100644
--- a/source/java/org/alfresco/repo/avm/ChildEntryImpl.java
+++ b/source/java/org/alfresco/repo/avm/ChildEntryImpl.java
@@ -37,11 +37,6 @@ public class ChildEntryImpl implements ChildEntry, Serializable
      */
     private AVMNode fChild;
     
-    /**
-     * Version for optimistic locking.
-     */
-    private long fVers;
-    
     /**
      * Default constructor for Hibernate.
      */
@@ -126,20 +121,4 @@ public class ChildEntryImpl implements ChildEntry, Serializable
     {
         return fKey.hashCode();
     }
-    
-    /**
-     * Setter.
-     */
-    public void setVers(long vers)
-    {
-        fVers = vers;
-    }
-    
-    /**
-     * Getter.
-     */
-    public long getVers()
-    {
-        return fVers;
-    }
 }
diff --git a/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml b/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
index 1d90b1ef35..e4e1c020c7 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
+++ b/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
@@ -139,14 +139,12 @@
 		<property name="tag" type="string" length="255" column="tag"/>
 		<property name="description" type="string" length="8192" column="description"/>
 	</class>
-    <class name="ChildEntryImpl" proxy="ChildEntry" table="avm_child_entries"
-           optimistic-lock="version">
+    <class name="ChildEntryImpl" proxy="ChildEntry" table="avm_child_entries">
         <cache usage="read-write"/>
         <composite-id name="key" class="ChildKey">
             <key-many-to-one name="parent" column="parent_id" class="DirectoryNodeImpl"/>
             <key-property name="name" column="name" type="string" length="160"/>
         </composite-id>
-		<version name="vers" column="vers" type="long"/>
         <many-to-one name="child" column="child_id" class="AVMNodeImpl"
 	                 not-null="true"/>
     </class>