diff --git a/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java b/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
index 8d9987189f..9f74c2ce67 100644
--- a/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
@@ -89,6 +89,18 @@ public class AVMSyncServiceImpl implements AVMSyncService
                                        int dstVersion, String dstPath,
                                        NameMatcher excluder)
     {
+        if (fgLogger.isDebugEnabled())
+        {
+            fgLogger.debug(srcPath + " : " + dstPath);
+            try
+            {
+                throw new Exception();
+            }
+            catch (Exception e)
+            {
+                fgLogger.debug("Stack Trace: ", e);
+            }
+        }
         if (srcPath == null || dstPath == null)
         {
             throw new AVMBadArgumentException("Illegal null path.");
@@ -318,6 +330,17 @@ public class AVMSyncServiceImpl implements AVMSyncService
                        NameMatcher excluder, boolean ignoreConflicts, boolean ignoreOlder,
                        boolean overrideConflicts, boolean overrideOlder, String tag, String description)
     {
+        if (fgLogger.isDebugEnabled())
+        {
+            try
+            {
+                throw new Exception("Stack Trace.");
+            }
+            catch (Exception e)
+            {
+                fgLogger.debug("Stack trace: ", e);
+            }
+        }
         Map<String, Integer> storeVersions = new HashMap<String, Integer>();
         Set<String> destStores = new HashSet<String>();
         for (AVMDifference diff : diffList)
@@ -331,6 +354,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
             {
                 throw new AVMSyncException("Malformed AVMDifference.");
             }
+            if (fgLogger.isDebugEnabled())
+            {
+                fgLogger.debug("update: " + diff);
+            }
             // Snapshot the source if needed.
             int version = diff.getSourceVersion();
             if (version < 0)
@@ -656,6 +683,18 @@ public class AVMSyncServiceImpl implements AVMSyncService
         {
             throw new AVMNotFoundException("Not found: " + underlyingPath);
         }
+        if (fgLogger.isDebugEnabled())
+        {
+            fgLogger.debug("flatten: " + layerNode + " " + underlyingNode);
+            try
+            {
+                throw new Exception("Stack Trace:");
+            }
+            catch (Exception e)
+            {
+                fgLogger.debug("Stack Trace: ", e);
+            }
+        }
         flatten(layerNode, underlyingNode);
     }
     
@@ -666,6 +705,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
      */
     private boolean flatten(AVMNodeDescriptor layer, AVMNodeDescriptor underlying)
     {
+        if (fgLogger.isDebugEnabled())
+        {
+            fgLogger.debug("flatten: " + layer + " " + underlying);
+        }
         if (!layer.isLayeredDirectory())
         {
             return false;
diff --git a/source/java/org/alfresco/service/cmr/avm/AVMNodeDescriptor.java b/source/java/org/alfresco/service/cmr/avm/AVMNodeDescriptor.java
index f26c32d44f..c0a16ec112 100644
--- a/source/java/org/alfresco/service/cmr/avm/AVMNodeDescriptor.java
+++ b/source/java/org/alfresco/service/cmr/avm/AVMNodeDescriptor.java
@@ -411,7 +411,7 @@ public class AVMNodeDescriptor implements Serializable
             case AVMNodeType.PLAIN_FILE :
                 return "[PF:" + fID + "]";
             case AVMNodeType.PLAIN_DIRECTORY :
-                return "[PD:" + fID + "]";
+                return "[PD:" + fID + ":" + fPath + "]";
             case AVMNodeType.LAYERED_FILE :
                 return "[LF:" + fID + ":" + fIndirection + "]";
             case AVMNodeType.LAYERED_DIRECTORY :