diff --git a/config/alfresco/model/wcmAppModel.xml b/config/alfresco/model/wcmAppModel.xml
index a46c4c9b3b..43ee4f91aa 100644
--- a/config/alfresco/model/wcmAppModel.xml
+++ b/config/alfresco/model/wcmAppModel.xml
@@ -297,7 +297,6 @@
             <property name="wca:deployserverport">
                <title>Port</title>
                <type>d:int</type>
-               <mandatory enforced="true">true</mandatory>
             </property>
             <property name="wca:deployservername">
                <title>Display Name</title>
@@ -330,7 +329,6 @@
             <property name="wca:deployonapproval">
                <title>Deploy On Approval</title>
                <type>d:boolean</type>
-               <default>false</default>
             </property>
          </properties>
       </type>
diff --git a/source/java/org/alfresco/repo/avm/actions/AVMDeploySnapshotAction.java b/source/java/org/alfresco/repo/avm/actions/AVMDeploySnapshotAction.java
index b5c3a7ab58..50e428458b 100644
--- a/source/java/org/alfresco/repo/avm/actions/AVMDeploySnapshotAction.java
+++ b/source/java/org/alfresco/repo/avm/actions/AVMDeploySnapshotAction.java
@@ -65,6 +65,7 @@ import org.apache.commons.logging.LogFactory;
 public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase
 {
    public static final String NAME = "avm-deploy-snapshot";
+   public static final String FILE_SERVER_PREFIX = "\\\\";
 
    public static final String PARAM_WEBSITE = "website";
    public static final String PARAM_SERVER = "server";
@@ -83,7 +84,6 @@ public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase
 
    private static Log logger = LogFactory.getLog(AVMDeploySnapshotAction.class);
    private static Log delayDeploymentLogger = LogFactory.getLog("alfresco.deployment.delay");
-   private static final String FILE_SERVER_PREFIX = "\\\\";
    
    /**
     * Calculate the URI representation of a server from the given set of properties
@@ -439,7 +439,7 @@ public class AVMDeploySnapshotAction extends ActionExecuterAbstractBase
          reportProps.put(WCMAppModel.PROP_DEPLOYFAILEDREASON, error.getMessage());
       }
       reportRef = this.nodeService.createNode(attempt, 
-               WCMAppModel.ASSOC_DEPLOYMENTREPORTS, WCMAppModel.ASSOC_DEPLOYMENTREPORT, 
+               WCMAppModel.ASSOC_DEPLOYMENTREPORTS, WCMAppModel.ASSOC_DEPLOYMENTREPORTS, 
                WCMAppModel.TYPE_DEPLOYMENTREPORT, reportProps).getChildRef();
       ContentWriter writer = contentService.getWriter(reportRef, ContentModel.PROP_CONTENT, true);
       writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);