diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index e44da71f3b..1b1eb69b2b 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -160,6 +160,12 @@
     <bean id="workflowBootstrap" parent="workflowDeployer">
 		<property name="workflowDefinitions">
 			<list>
+			    <props>
+			    	<prop key="engineId">jbpm</prop>
+			    	<prop key="location">alfresco/workflow/wcmSubmit.xml</prop>
+			    	<prop key="mimetype">text/xml</prop>
+			    	<prop key="redeploy">false</prop>
+			    </props>
 				<props>
 					<prop key="engineId">jbpm</prop>
 					<prop key="location">alfresco/workflow/review_processdefinition.xml</prop>
diff --git a/config/alfresco/hibernate-context.xml b/config/alfresco/hibernate-context.xml
index 4cbfd5fe4d..115539c043 100644
--- a/config/alfresco/hibernate-context.xml
+++ b/config/alfresco/hibernate-context.xml
@@ -31,7 +31,7 @@
     </bean>
     <bean id="sessionFactoryBase" abstract="true">
         <property name="schemaUpdate">
-           <value>false</value>
+           <value>true</value>
         </property>
         <property name="mappingResources">
             <list>
diff --git a/config/alfresco/workflow/wcmSubmit.xml b/config/alfresco/workflow/wcmSubmit.xml
index bacc922ff3..7a1e52d4ec 100644
--- a/config/alfresco/workflow/wcmSubmit.xml
+++ b/config/alfresco/workflow/wcmSubmit.xml
@@ -22,7 +22,7 @@
 	<task-node name="setup">
 		<task name="wcmwf:setupSubmit" swimlane="initiator">
 			<controller>
-				<variable name="assignee" access="write" mapped-name="wcmwf:assignee"/>
+				<variable name="assignee" access="write" mapped-name="bpm:assignee"/>
 				<variable name="description" access="write" mapped-name="wcmwf:description"/>
 				<variable name="package" access="write" mapped-name="bpm:package"/>
 				<variable name="workflowcontext" access="write" mapped-name="bpm:context"/>
@@ -32,7 +32,7 @@
 	</task-node>
 	
     <swimlane name="assignee">
-        <assignment actor-id="#{assignee.properties['cm:userName']}"/>
+        <assignment actor-id="#{bpm_assignee.properties['cm:userName']}"/>
     </swimlane>
 
     <task-node name="review">
diff --git a/config/alfresco/workflow/wcmSubmitModel.xml b/config/alfresco/workflow/wcmSubmitModel.xml
index 5d00a22056..84019cd2df 100644
--- a/config/alfresco/workflow/wcmSubmitModel.xml
+++ b/config/alfresco/workflow/wcmSubmitModel.xml
@@ -22,30 +22,21 @@
                    <type>d:text</type>
                </property>
             </properties>
+            
+            
         </type>
 
         <type name="wcmwf:startSubmit">
             <title>Submit Web Content</title>
             <parent>wcmwf:baseSubmitTask</parent>
+	         <mandatory-aspects>
+    	        <aspect>bpm:assignee</aspect>
+        	 </mandatory-aspects>
         </type>
 
 		<type name="wcmwf:setupSubmit">
 			<title>Submit Web Content</title>
 			<parent>wcmwf:baseSubmitTask</parent>
-			<associations>
-				<association name="wcmwf:assignee">
-					<title>The Reviewer</title>
-					<source>
-						<mandatory>false</mandatory>
-						<many>false</many>
-					</source>
-					<target>
-						<class>cm:person</class>
-						<mandatory>true</mandatory>
-						<many>false</many>
-					</target>
-				</association>
-			</associations>
 		</type>
 
         <type name="wcmwf:review">
diff --git a/source/java/org/alfresco/repo/avm/AVMCrawlTest.java b/source/java/org/alfresco/repo/avm/AVMCrawlTest.java
index 44c186404d..e498dd36bc 100644
--- a/source/java/org/alfresco/repo/avm/AVMCrawlTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMCrawlTest.java
@@ -35,9 +35,9 @@ public class AVMCrawlTest extends AVMServiceTestBase
      */
     public void testCrawl()
     {
-        int n = 2;               // Number of Threads.
-        int m = 2;              // How many multiples of content to start with.
-        long runTime = 600000;  // Ten minutes
+        int n = 1;               // Number of Threads.
+        int m = 1;              // How many multiples of content to start with.
+        long runTime = 120000;  // 2 minutes
         fService.purgeAVMStore("main");
         BulkLoader loader = new BulkLoader();
         loader.setAvmService(fService);
diff --git a/source/java/org/alfresco/repo/avm/AVMStressTest.java b/source/java/org/alfresco/repo/avm/AVMStressTest.java
index b596c6892b..d215a6727f 100644
--- a/source/java/org/alfresco/repo/avm/AVMStressTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMStressTest.java
@@ -35,8 +35,8 @@ public class AVMStressTest extends AVMServiceTestBase
     {
         try
         {
-            int nCopies = 2;
-            int nThreads = 2;
+            int nCopies = 1;
+            int nThreads = 1;
             BulkLoader loader = new BulkLoader();
             loader.setAvmService(fService);
             long start = System.currentTimeMillis();
diff --git a/source/java/org/alfresco/repo/avm/SimultaneousLoadTest.java b/source/java/org/alfresco/repo/avm/SimultaneousLoadTest.java
index 842577a745..6d97bd2bb8 100644
--- a/source/java/org/alfresco/repo/avm/SimultaneousLoadTest.java
+++ b/source/java/org/alfresco/repo/avm/SimultaneousLoadTest.java
@@ -32,7 +32,7 @@ public class SimultaneousLoadTest extends AVMServiceTestBase
     {
         try
         {
-            int n = 4;
+            int n = 1;
             int m = 1;
             fReaper.setInactiveBaseSleep(60000);
             for (int i = 0; i < n; i++)
diff --git a/source/java/org/alfresco/repo/avm/actions/StartAVMWorkflowAction.java b/source/java/org/alfresco/repo/avm/actions/StartAVMWorkflowAction.java
index 3fb5288705..eacad2e117 100644
--- a/source/java/org/alfresco/repo/avm/actions/StartAVMWorkflowAction.java
+++ b/source/java/org/alfresco/repo/avm/actions/StartAVMWorkflowAction.java
@@ -100,6 +100,7 @@ public class StartAVMWorkflowAction extends ActionExecuterAbstractBase
             fgLogger.error(wfParams.get(name));
         }
         WorkflowPath path = fWorkflowService.startWorkflow(def.id, wfParams);
+        /*
         if (path != null)
         {
             fgLogger.error("Workflow path is not null.");
@@ -119,6 +120,7 @@ public class StartAVMWorkflowAction extends ActionExecuterAbstractBase
                 }
             }
         }
+        */
     }
 
     /**