diff --git a/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java b/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java
index c9dff89bb9..b7fe5cbacb 100644
--- a/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java
+++ b/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java
@@ -806,6 +806,7 @@ class LayeredDirectoryNodeImpl extends DirectoryNodeImpl implements LayeredDirec
             {
                 ChildEntry entry = AVMContext.fgInstance.fChildEntryDAO.getByNameParent(name, this);
                 AVMContext.fgInstance.fChildEntryDAO.delete(entry);
+                AVMContext.fgInstance.fAVMNodeDAO.flush();
             }
         }
         // Make the new ChildEntry and save.
diff --git a/source/java/org/alfresco/repo/avm/PlainDirectoryNodeImpl.java b/source/java/org/alfresco/repo/avm/PlainDirectoryNodeImpl.java
index db9f8b7140..fc3d217737 100644
--- a/source/java/org/alfresco/repo/avm/PlainDirectoryNodeImpl.java
+++ b/source/java/org/alfresco/repo/avm/PlainDirectoryNodeImpl.java
@@ -445,6 +445,8 @@ class PlainDirectoryNodeImpl extends DirectoryNodeImpl implements PlainDirectory
             }
             // Get rid of the DELETED_NODE child.
             AVMContext.fgInstance.fChildEntryDAO.delete(child);
+            // Another &*#*&#$ flush.
+            AVMContext.fgInstance.fAVMNodeDAO.flush();
         }
         // Make the new entry and save.
         ChildEntry newChild = new ChildEntryImpl(name, this, node);
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 957100ef7d..69b0cbb3b5 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
+++ b/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
@@ -141,9 +141,11 @@
 		<id name="id" column="id" type="long">
 			<generator class="native"/>
 		</id>
+		<natural-id>
+			<property name="name" type="string" length="160" column="name" index="child_name_index" not-null="true"/>
+			<many-to-one name="parent" column="parent_id" class="DirectoryNodeImpl" not-null="true"/>
+		</natural-id>
 		<version name="vers" column="vers" type="long"/>
-		<property name="name" type="string" column="name" index="child_name_index" not-null="true"/>
-		<many-to-one name="parent" column="parent_id" class="DirectoryNodeImpl" not-null="true"/>
 		<many-to-one name="child" column="child_id" class="AVMNodeImpl"
 			not-null="true"/>
 	</class>