diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index e185d91381..aba2b0bd76 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -1,6 +1,6 @@
 # Directory configuration
 
-dir.root=./alf_data
+dir.root=./alf_data_new
 
 dir.contentstore=${dir.root}/contentstore
 dir.contentstore.deleted=${dir.root}/contentstore.deleted
@@ -50,10 +50,10 @@ lucene.lock.poll.interval=100
 # Database configuration
 
 db.driver=org.gjt.mm.mysql.Driver
-db.name=alfresco
+db.name=alfresco_new
 db.url=jdbc:mysql:///${db.name}
-db.username=alfresco
-db.password=alfresco
+db.username=alfresco_new
+db.password=alfresco_new
 
 #db.name=alfresco
 #db.url=jdbc:mysql://qasi/${db.name}
diff --git a/source/java/org/alfresco/repo/importer/ImporterComponent.java b/source/java/org/alfresco/repo/importer/ImporterComponent.java
index 58fc891233..6b8690e0d6 100644
--- a/source/java/org/alfresco/repo/importer/ImporterComponent.java
+++ b/source/java/org/alfresco/repo/importer/ImporterComponent.java
@@ -551,7 +551,19 @@ public class ImporterComponent
                 DataTypeDefinition valueDataType = context.getPropertyDataType(property.getKey());
                 if (valueDataType != null && valueDataType.getName().equals(DataTypeDefinition.CONTENT))
                 {
-                    importContent(nodeRef, property.getKey(), (String)property.getValue());
+                    // the property may be a single value or a collection - handle both
+                    Object objVal = property.getValue();
+                    if (objVal instanceof String)
+                    {
+                       importContent(nodeRef, property.getKey(), (String)objVal);
+                    }
+                    else if (objVal instanceof List)
+                    {
+                       for (String value : (List<String>)objVal)
+                       {
+                          importContent(nodeRef, property.getKey(), value);
+                       }
+                    }
                 }
             }
             
diff --git a/source/java/org/alfresco/repo/jscript/Node.java b/source/java/org/alfresco/repo/jscript/Node.java
index 176599ae2d..deb7b1db9d 100644
--- a/source/java/org/alfresco/repo/jscript/Node.java
+++ b/source/java/org/alfresco/repo/jscript/Node.java
@@ -782,7 +782,7 @@ public final class Node implements Serializable
     public void save()
     {
         // persist properties back to the node in the DB 
-        Map<QName, Serializable> props = new HashMap<QName, Serializable>(this.properties.size());
+        Map<QName, Serializable> props = new HashMap<QName, Serializable>(getProperties().size());
         for (String key : this.properties.keySet())
         {
             Serializable value = (Serializable)this.properties.get(key);
@@ -911,9 +911,9 @@ public final class Node implements Serializable
     }
     
     /**
-     * Delete this node. Any references to this Node or its NodeRef should be discarded!
+     * Remove this node. Any references to this Node or its NodeRef should be discarded!
      */
-    public boolean delete()
+    public boolean remove()
     {
         boolean success = false;