diff --git a/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemLoader.java b/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemLoader.java
index 67d7bb78a..97dcf8dd0 100755
--- a/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemLoader.java
+++ b/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemLoader.java
@@ -35,9 +35,12 @@ import java.util.List;
 
 public class FormItemLoader extends AbstractContentTypeLoader {
 
+    /** List of content sections to install Forms. An empty list installs
+     *  Forms into the default (first) content section only.
+     */
     private final Parameter m_contentSections = new StringParameter
         ("com.arsdigita.cms.formbuilder.FormItem.sections",
-         Parameter.REQUIRED, "content");
+         Parameter.REQUIRED, "");
 
     {
         register(m_contentSections);
@@ -52,6 +55,15 @@ public class FormItemLoader extends AbstractContentTypeLoader {
         return TYPES;
     }
 
+    /**
+     * Overwrites parents class's method to predefine into which content sections
+     * Forms should get installed.
+     * An empty list (the default parents's implementation) gets Forms installed
+     * into the default section only.
+     * 
+     * @return Array of content sections Forms should be installed into 
+     */
+    @Override
     public List getContentSections() {
         List result = new ArrayList(1);
         result.add(get(m_contentSections));
diff --git a/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemLoader_parameter.properties b/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemLoader_parameter.properties
index 8557a78f7..3d2245863 100755
--- a/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemLoader_parameter.properties
+++ b/ccm-cms-types-formitem/src/com/arsdigita/cms/formbuilder/FormItemLoader_parameter.properties
@@ -2,6 +2,6 @@
 # Version: $Revision: #1 $ $DateTime: 2003/12/01 17:44:38 $
 
 com.arsdigita.cms.formbuilder.FormItem.sections.title   = Content Sections
-com.arsdigita.cms.formbuilder.FormItem.sections.purpose = The list of content sections into which FormItem should be installed
+com.arsdigita.cms.formbuilder.FormItem.sections.purpose = A comma separated list of content sections into which FormItem should be installed. An empty list (the default) installs into the default section.
 com.arsdigita.cms.formbuilder.FormItem.sections.example = forms,surveys
 com.arsdigita.cms.formbuilder.FormItem.sections.format  = [string]
diff --git a/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemLoader.java b/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemLoader.java
index ea31ec6f7..f20abf3a3 100755
--- a/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemLoader.java
+++ b/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemLoader.java
@@ -39,9 +39,12 @@ public class FormSectionItemLoader extends AbstractContentTypeLoader {
         "/WEB-INF/content-types/com/arsdigita/cms/formbuilder/FormSectionItem.xml"
     };
 
+    /** List of content sections to install FormSection. An empty list installs
+     *  Forms into the default (first) content section only.
+     */
     private final Parameter m_contentSections = new StringParameter
         ("com.arsdigita.cms.formbuilder.FormSectionItem.sections",
-         Parameter.REQUIRED, "content");
+         Parameter.REQUIRED, "");
 
     {
         register(m_contentSections);
@@ -52,6 +55,15 @@ public class FormSectionItemLoader extends AbstractContentTypeLoader {
         return TYPES;
     }
 
+    /**
+     * Overwrites parents class's method to predefine into which content sections
+     * Forms should get installed.
+     * An empty list (the default parents's implementation) gets Forms installed
+     * into the default section only.
+     * 
+     * @return Array of content sections Forms should be installed into 
+     */
+    @Override
     public List getContentSections() {
         List result = new ArrayList(1);
         result.add(get(m_contentSections));
diff --git a/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemLoader_parameter.properties b/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemLoader_parameter.properties
index 2caa42781..75161a480 100755
--- a/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemLoader_parameter.properties
+++ b/ccm-cms-types-formsectionitem/src/com/arsdigita/cms/formbuilder/FormSectionItemLoader_parameter.properties
@@ -2,6 +2,6 @@
 # Version: $Revision: #1 $ $DateTime: 2003/12/01 17:44:38 $
 
 com.arsdigita.cms.formbuilder.FormSectionItem.sections.title   = Content Sections
-com.arsdigita.cms.formbuilder.FormSectionItem.sections.purpose = The list of content sections into which FormSectionItem should be installed
+com.arsdigita.cms.formbuilder.FormSectionItem.sections.purpose = A comma separated list of content sections into which FormSectionItem should be installed. An empty list (the default) installs into the default section.
 com.arsdigita.cms.formbuilder.FormSectionItem.sections.example = forms,surveys
 com.arsdigita.cms.formbuilder.FormSectionItem.sections.format  = [string]
diff --git a/ccm-cms/src/com/arsdigita/cms/CMSConfig_parameter.properties b/ccm-cms/src/com/arsdigita/cms/CMSConfig_parameter.properties
index 0a9d1849f..c3bdf9e51 100755
--- a/ccm-cms/src/com/arsdigita/cms/CMSConfig_parameter.properties
+++ b/ccm-cms/src/com/arsdigita/cms/CMSConfig_parameter.properties
@@ -294,9 +294,3 @@ com.arsdigita.cms.image_browser.thumbnail_max_height.title=Max thumbnails height
 com.arsdigita.cms.image_browser.thumbnail_max_height.purpose=Set the maximum height of the thumbnail in ImageBrowserr
 com.arsdigita.cms.image_browser.thumbnail_max_height.example=150
 com.arsdigita.cms.image_browser.thumbnail_max_height.format=[integer]
-
-com.arsdigita.cms.xx.title=
-com.arsdigita.cms.xx.purpose=
-com.arsdigita.cms.xx.example=
-com.arsdigita.cms.xx.format=[string]
-
diff --git a/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp b/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp
index 0616ab2ca..87905bd56 100644
--- a/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp
+++ b/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp
@@ -28,7 +28,7 @@
     <define:component name="portalWorkspace"
       classname="com.arsdigita.london.portal.ui.WorkspaceViewer"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.portal.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
+      ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
     </jsp:scriptlet>
   </define:page>
 
diff --git a/ccm-navigation/src/com/arsdigita/navigation/NavigationConfig_parameter.properties b/ccm-navigation/src/com/arsdigita/navigation/NavigationConfig_parameter.properties
index 85637c7f7..fac731a61 100755
--- a/ccm-navigation/src/com/arsdigita/navigation/NavigationConfig_parameter.properties
+++ b/ccm-navigation/src/com/arsdigita/navigation/NavigationConfig_parameter.properties
@@ -18,11 +18,6 @@ com.arsdigita.navigation.inherit_templates.purpose=If no template for category,
 com.arsdigita.navigation.inherit_templates.example=true|false
 com.arsdigita.navigation.inherit_templates.format=[boolean]
 
-com.arsdigita.navigation.default_content_section_url.title=Default Content Section URL
-com.arsdigita.navigation.default_content_section_url.purpose=The URL of the default content section
-com.arsdigita.navigation.default_content_section_url.example=/content/
-com.arsdigita.navigation.default_content_section_url.format=[string]
-
 com.arsdigita.navigation.related_items_context.title=Related items category use context
 com.arsdigita.navigation.related_items_context.purpose=The category use context for the related items query
 com.arsdigita.navigation.related_items_context.example=subject