diff --git a/config/alfresco/workflow/wcmWorkflowModel.xml b/config/alfresco/workflow/wcmWorkflowModel.xml
index ecb15544c6..19bae2c4ac 100644
--- a/config/alfresco/workflow/wcmWorkflowModel.xml
+++ b/config/alfresco/workflow/wcmWorkflowModel.xml
@@ -4,7 +4,8 @@
 
   <imports>
     <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
-    <import uri="http://www.alfresco.org/model/bpm/1.0" prefix="bpm"/>
+    <import uri="http://www.alfresco.org/model/bpm/1.0" prefix="bpm"/>
+    <import uri="http://www.alfresco.org/model/wcmappmodel/1.0" prefix="wca"/>
   </imports>
 
   <namespaces>
@@ -64,7 +65,20 @@
             <constraint ref="wcmwf:reviewType" />
           </constraints>
         </property>
-      </properties>
+      </properties>
+      <associations>
+        <association name="wcmwf:webproject">
+          <source>
+            <mandatory>false</mandatory>
+            <many>false</many>
+          </source>
+          <target>
+            <class>wca:webfolder</class>
+            <mandatory>true</mandatory>
+            <many>false</many>
+          </target>
+        </association>
+      </associations>
       <mandatory-aspects>
         <aspect>bpm:assignees</aspect>
         <aspect>wcmwf:submission</aspect>
diff --git a/source/java/org/alfresco/repo/jscript/Node.java b/source/java/org/alfresco/repo/jscript/Node.java
index e1d439497a..b5396d5073 100644
--- a/source/java/org/alfresco/repo/jscript/Node.java
+++ b/source/java/org/alfresco/repo/jscript/Node.java
@@ -1802,8 +1802,7 @@ public class Node implements Serializable, Scopeable
             // TODO: DC: Allow debug output of property values - for now it's disabled as this could potentially
             // follow a large network of nodes. Unfortunately, JBPM issues unprotected debug statements
             // where node.toString is used - will request this is fixed in next release of JBPM.
-            return "Node Type: " + getType() + "\nNode Properties: " + this.getProperties().size() +
-                    "\nNode Aspects: " + this.getAspects().toString();
+            return "Node Type: " + getType() + ", Node Aspects: " + this.getAspects().toString();
         }
         else
         {
diff --git a/source/java/org/alfresco/service/namespace/NamespaceService.java b/source/java/org/alfresco/service/namespace/NamespaceService.java
index 9c077932bb..e9720fe97b 100644
--- a/source/java/org/alfresco/service/namespace/NamespaceService.java
+++ b/source/java/org/alfresco/service/namespace/NamespaceService.java
@@ -118,6 +118,11 @@ public interface NamespaceService extends NamespacePrefixResolver
     /** WCM Application Model Prefix */
     static final String WCMAPP_MODEL_PREFIX = "wca";
     
+    /** WCM Workflow Model Prefix */
+    static final String WCMWF_MODEL = "wcmwf";
+    
+    /** WCM Workflow Model URI */
+    static final String WCMWF_MODEL_1_0_URI = "http://www.alfresco.org/model/wcmworkflow/1.0";
     
     /**
      * Register a prefix for namespace uri.