diff --git a/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java b/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
index 2192c003b1..76e1097dc1 100644
--- a/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
+++ b/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
@@ -536,8 +536,9 @@ public class RhinoScriptProcessor extends BaseProcessor implements ScriptProcess
     /**
      * Converts the passed model into a Rhino model
      * 
-     * @param model the model
-     * @return  Map<String, Object> the converted model
+     * @param model     the model
+     * 
+     * @return Map<String, Object> the converted model
      */
     private Map<String, Object> convertToRhinoModel(Map<String, Object> model)
     {
diff --git a/source/java/org/alfresco/repo/jscript/ValueConverter.java b/source/java/org/alfresco/repo/jscript/ValueConverter.java
index 2ccb8d28fd..f5d695c978 100644
--- a/source/java/org/alfresco/repo/jscript/ValueConverter.java
+++ b/source/java/org/alfresco/repo/jscript/ValueConverter.java
@@ -99,13 +99,14 @@ public class ValueConverter
         {
             // recursively convert each value in the collection
             Collection<Serializable> collection = (Collection<Serializable>)value;
-            Serializable[] array = new Serializable[collection.size()];
+            Object[] array = new Object[collection.size()];
             int index = 0;
             for (Serializable obj : collection)
             {
                 array[index++] = convertValueForScript(services, scope, qname, obj);
             }
-            value = array;
+            // convert array to a native JavaScript Array
+            value = (Serializable)Context.getCurrentContext().newArray(scope, array);
         }
         // simple numbers and strings are wrapped automatically by Rhino
         
diff --git a/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java b/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java
index 586cab5e4b..2d0a113ecc 100644
--- a/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java
+++ b/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java
@@ -269,6 +269,13 @@ public class FreeMarkerProcessor extends BaseProcessor implements TemplateProces
         }
     }
     
+    /**
+     * Converts the passed model into a FreeMarker model
+     * 
+     * @param model     the model
+     * 
+     * @return Object the converted model
+     */
     private Object convertToFreeMarkerModel(Object model)
     {
         // If we dont have a map in our hand we just return the passes model
diff --git a/source/java/org/alfresco/repo/template/PropertyConverter.java b/source/java/org/alfresco/repo/template/PropertyConverter.java
new file mode 100644
index 0000000000..564c458a27
--- /dev/null
+++ b/source/java/org/alfresco/repo/template/PropertyConverter.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+package org.alfresco.repo.template;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.TemplateImageResolver;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Simple class to recursively convert property values to bean objects accessable by Templates.
+ * 
+ * @author Kevin Roast
+ */
+public class PropertyConverter
+{
+    public Serializable convertProperty(
+            Serializable value, QName name, ServiceRegistry services, TemplateImageResolver resolver)
+    {
+        // perform conversions from Java objects to template compatable instances
+        if (value == null)
+        {
+            return null;
+        }
+        else if (value instanceof NodeRef)
+        {
+            // NodeRef object properties are converted to new TemplateNode objects
+            // so they can be used as objects within a template
+            value = new TemplateNode(((NodeRef)value), services, resolver);
+        }
+        else if (value instanceof List)
+        {
+            // recursively convert each value in the collection
+            List<Serializable> list = (List<Serializable>)value;
+            for (int i=0; i<list.size(); i++)
+            {
+                list.set(i, convertProperty(list.get(i), name, services, resolver));
+            }
+        }
+        
+        return value;
+    }
+}
diff --git a/source/java/org/alfresco/repo/template/TemplateNode.java b/source/java/org/alfresco/repo/template/TemplateNode.java
index 0f5d103972..1da01515ac 100644
--- a/source/java/org/alfresco/repo/template/TemplateNode.java
+++ b/source/java/org/alfresco/repo/template/TemplateNode.java
@@ -90,6 +90,8 @@ public class TemplateNode extends BasePermissionsNode
     private ChildAssociationRef primaryParentAssoc = null;
     private Boolean isCategory = null;
     
+    private PropertyConverter propertyConverter = new TemplatePropertyConverter();
+    
     
     // ------------------------------------------------------------------------------
     // Construction 
@@ -197,20 +199,9 @@ public class TemplateNode extends BasePermissionsNode
             
             for (QName qname : props.keySet())
             {
-                Serializable propValue = props.get(qname);
-                if (propValue instanceof NodeRef)
-                {
-                    // NodeRef object properties are converted to new TemplateNode objects
-                    // so they can be used as objects within a template
-                    propValue = new TemplateNode(((NodeRef)propValue), this.services, this.imageResolver);
-                }
-                else if (propValue instanceof ContentData)
-                {
-                    // ContentData object properties are converted to TemplateContentData objects
-                    // so the content and other properties of those objects can be accessed
-                    propValue = new TemplateContentData((ContentData)propValue, qname);
-                }
-                this.properties.put(qname.toString(), propValue);
+                Serializable value = this.propertyConverter.convertProperty(
+                        props.get(qname), qname, this.services, getImageResolver());
+                this.properties.put(qname.toString(), value);
             }
             
             this.propsRetrieved = true;
@@ -458,4 +449,30 @@ public class TemplateNode extends BasePermissionsNode
     {
         return this.imageResolver;
     }
+    
+    
+    // ------------------------------------------------------------------------------
+    // Inner classes
+    
+    /**
+     * Class to convert properties into template accessable objects
+     */
+    class TemplatePropertyConverter extends PropertyConverter
+    {
+        @Override
+        public Serializable convertProperty(
+                Serializable value, QName name, ServiceRegistry services, TemplateImageResolver resolver)
+        {
+            if (value instanceof ContentData)
+            {
+                // ContentData object properties are converted to TemplateContentData objects
+                // so the content and other properties of those objects can be accessed
+                return new TemplateContentData((ContentData)value, name);
+            }
+            else
+            {
+                return super.convertProperty(value, name, services, resolver);
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/source/java/org/alfresco/service/cmr/repository/ScriptService.java b/source/java/org/alfresco/service/cmr/repository/ScriptService.java
index b25c69eaf7..2f98499bd1 100644
--- a/source/java/org/alfresco/service/cmr/repository/ScriptService.java
+++ b/source/java/org/alfresco/service/cmr/repository/ScriptService.java
@@ -180,7 +180,7 @@ public interface ScriptService
      * 
      * @param scriptProcessor
      */
-    @Auditable(parameters = {"scriptProcessot"})
+    @Auditable(parameters = {"scriptProcessor"})
     public void registerScriptProcessor(ScriptProcessor scriptProcessor);
     
     /**
@@ -203,6 +203,7 @@ public interface ScriptService
      * 
      * @return A Map of global scope scriptable Node objects
      */
+    @Auditable(parameters = {"person", "companyHome", "userHome", "script", "document", "document"})
     public Map<String, Object> buildDefaultModel(
             NodeRef person, 
             NodeRef companyHome, 
diff --git a/source/java/org/alfresco/service/cmr/repository/TemplateService.java b/source/java/org/alfresco/service/cmr/repository/TemplateService.java
index 03669659bf..94fcea357d 100644
--- a/source/java/org/alfresco/service/cmr/repository/TemplateService.java
+++ b/source/java/org/alfresco/service/cmr/repository/TemplateService.java
@@ -169,7 +169,7 @@ public interface TemplateService
      * @param imageResolver the image resolver (optional)
      * @return
      */
-    @Auditable(parameters = {"person", "compantHome", "userHome", "template", "imageResolver"})
+    @Auditable(parameters = {"person", "companyHome", "userHome", "template", "imageResolver"})
     public Map<String, Object> buildDefaultModel(
             NodeRef person, 
             NodeRef companyHome,