diff --git a/config/alfresco/action-services-context.xml b/config/alfresco/action-services-context.xml
index ced22775ba..2db58b8536 100644
--- a/config/alfresco/action-services-context.xml
+++ b/config/alfresco/action-services-context.xml
@@ -519,7 +519,7 @@
          <value>admin</value>
       </property>
       <property name="defaultAlfrescoRmiPort">
-         <value>50500</value>
+         <value>${alfresco.rmi.services.port}</value>
       </property>
       <property name="defaultReceiverRmiPort">
          <value>44100</value>
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java b/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
index e5c9512296..cc2b1029d0 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
@@ -149,8 +149,14 @@ public class AVMServiceTestBase extends TestCase
                 }
             );
         }
-        fService.createStore("main");
-        fLockingService.addWebProject("main");
+        if (fService.getStore("main") == null)
+        {
+            fService.createStore("main");
+        }
+        if (!fLockingService.getWebProjects().contains("main"))
+        {
+            fLockingService.addWebProject("main");
+        }
         fStartTime = System.currentTimeMillis();
     }
 
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 3028976710..510e222072 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
+++ b/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
@@ -354,6 +354,14 @@
             and an.isRoot = false
     ]]>
     </query>
+    <query name="FindOrphans2">
+    <![CDATA[
+        select an
+        from ChildEntryImpl ce
+        right outer join ce.child an
+        where ce.child is null and an.isRoot = false
+    ]]>
+    </query>
     <query name="PlainFileNode.GetContentUrls">
     <![CDATA[
         select
diff --git a/source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java b/source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java
index 904b6c5b53..88a2011300 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java
@@ -148,7 +148,7 @@ class AVMNodeDAOHibernate extends HibernateDaoSupport implements
     @SuppressWarnings("unchecked")
     public List<AVMNode> getOrphans(int batchSize)
     {
-        Query query = getSession().getNamedQuery("FindOrphans");
+        Query query = getSession().getNamedQuery("FindOrphans2");
         query.setMaxResults(batchSize);
         return (List<AVMNode>)query.list();
     }
diff --git a/source/java/org/alfresco/repo/copy/CopyServicePolicies.java b/source/java/org/alfresco/repo/copy/CopyServicePolicies.java
index f5ed3ffe1b..aec3d21627 100644
--- a/source/java/org/alfresco/repo/copy/CopyServicePolicies.java
+++ b/source/java/org/alfresco/repo/copy/CopyServicePolicies.java
@@ -77,5 +77,8 @@ public interface CopyServicePolicies
 				NodeRef destinationRef,
                 boolean copyToNewNode,
 				Map<NodeRef, NodeRef> copyMap);
+		
+		static Arg ARG_0 = Arg.KEY;
+        static Arg ARG_1 = Arg.KEY; 
 	}
 }
diff --git a/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java b/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java
index f30506e07b..9dbb34fadc 100644
--- a/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java
+++ b/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java
@@ -692,6 +692,34 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
         assertEquals("Unexpected number of nodes present", 1, count);
     }
     
+    public void testLargeStrings() throws Exception
+    {
+        StringBuilder sb = new StringBuilder(2056);
+        for (int i = 0; i < 1024; i++)
+        {
+            sb.append("\u1234");
+        }
+        String longString = sb.toString();
+        int len = longString.length();
+        
+        // Create a normal node
+        Map<QName, Serializable> properties = new HashMap<QName, Serializable>(5);
+        // fill properties
+        fillProperties(TYPE_QNAME_TEST_CONTENT, properties);
+        fillProperties(ASPECT_QNAME_TEST_TITLED, properties);
+        
+        // create node for real
+        NodeRef nodeRef = nodeService.createNode(
+                rootNodeRef,
+                ASSOC_TYPE_QNAME_TEST_CHILDREN,
+                QName.createQName("MyContent"),
+                TYPE_QNAME_TEST_CONTENT,
+                properties).getChildRef();
+        
+        // Modify name using the long string
+        nodeService.setProperty(nodeRef, ContentModel.PROP_NAME, longString);
+    }
+    
     /**
      * @see #ASPECT_QNAME_TEST_TITLED
      */