diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/authoring/FileDisplay.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/authoring/FileDisplay.java
index f96448a73..fe3eb0e57 100755
--- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/authoring/FileDisplay.java
+++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/authoring/FileDisplay.java
@@ -2,15 +2,16 @@ package com.arsdigita.cms.docmgr.ui.authoring;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.SimpleComponent;
+import com.arsdigita.cms.CMS;
 import com.arsdigita.cms.FileAsset;
 import com.arsdigita.cms.ItemSelectionModel;
-import com.arsdigita.cms.dispatcher.CMSPage;
 import com.arsdigita.cms.dispatcher.Utilities;
 import com.arsdigita.mimetypes.MimeType;
 import com.arsdigita.xml.Element;
 
 
 /**
+ *
  */
 public class FileDisplay extends SimpleComponent {
 
@@ -30,10 +31,11 @@ public class FileDisplay extends SimpleComponent {
         m_asset = asset;
     }
 
+    @Override
     public void generateXML(PageState state, Element parent) {
       if ( isVisible(state) && m_asset != null ) {
   
-        Element element = new Element("cms:FileDisplay", CMSPage.CMS_XML_NS);
+        Element element = new Element("cms:FileDisplay", CMS.CMS_XML_NS);
   
         generateFilePropertiesXML(m_asset, state, element);
   
@@ -43,8 +45,8 @@ public class FileDisplay extends SimpleComponent {
     }
   
     protected void generateFilePropertiesXML(FileAsset asset,
-                                              PageState state,
-                                              Element element) {
+                                             PageState state,
+                                             Element element) {
 
         element.addAttribute("src", Utilities.getAssetURL(asset));
       
diff --git a/ccm-webpage/src/com/arsdigita/cms/webpage/ui/WebpageCMSEditorPage.java b/ccm-webpage/src/com/arsdigita/cms/webpage/ui/WebpageCMSEditorPage.java
index 0a2dcddb1..d2d3d831f 100755
--- a/ccm-webpage/src/com/arsdigita/cms/webpage/ui/WebpageCMSEditorPage.java
+++ b/ccm-webpage/src/com/arsdigita/cms/webpage/ui/WebpageCMSEditorPage.java
@@ -33,7 +33,7 @@ import com.arsdigita.bebop.form.TextField;
 import com.arsdigita.bebop.parameters.DateParameter;
 import com.arsdigita.bebop.parameters.IntegerParameter;
 import com.arsdigita.bebop.parameters.StringParameter;
-import com.arsdigita.categorization.Category;
+// import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
 import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentSection;